diff --git a/.gitmodules b/.gitmodules index e537b8d..6a1843a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "SDK"] path = SDK - url = git@git.minori.work:Embedded_SDK/MCUXpresso_MIMXRT1052xxxxB.git + url = https://git.minori.work/Embedded_SDK/MCUXpresso_MIMXRT1052xxxxB.git +[submodule "lib/whd/wifi-host-driver"] + path = lib/whd/wifi-host-driver + url = https://github.com/Infineon/wifi-host-driver.git +[submodule "lib/freertos"] + path = lib/freertos + url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 5698557..737398a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10) -project(fire_rt1052_pro_template) +project(fire_rt1052_whd) enable_language(CXX) enable_language(ASM) @@ -96,6 +96,7 @@ set(TARGET_SOURCES "board/peripherals.c" "board/pin_mux.c" "src/main.c" + "src/task_hello.c" "xip/fire_rt1052_pro_flexspi_nor_config.c" ) @@ -131,9 +132,9 @@ set(TARGET_C_INCLUDES # Shared libraries linked with application set(TARGET_LIBS - "c" + "freertos_kernel" "m" - "nosys" + "whd" ) # Shared library and linker script search paths @@ -159,6 +160,15 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-common -fno-builtin -f set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections") + +set(WHD_INTERFACE "SDIO" CACHE STRING "") +add_subdirectory(lib/whd) + +set(FREERTOS_HEAP "4" CACHE STRING "" FORCE) +set(FREERTOS_PORT "GCC_ARM_CM7" CACHE STRING "" FORCE) +set(FREERTOS_CONFIG_FILE_DIRECTORY "${CMAKE_SOURCE_DIR}/include") +add_subdirectory(lib/freertos) + # Shared sources, includes and definitions add_compile_definitions(${TARGET_C_DEFINES}) include_directories(${TARGET_C_INCLUDES}) diff --git a/SDK b/SDK new file mode 160000 index 0000000..ded8674 --- /dev/null +++ b/SDK @@ -0,0 +1 @@ +Subproject commit ded867438906eef783e00cf1effe5328c658cfc3 diff --git a/include/FreeRTOSConfig.h b/include/FreeRTOSConfig.h new file mode 100644 index 0000000..a2e8a17 --- /dev/null +++ b/include/FreeRTOSConfig.h @@ -0,0 +1,153 @@ +/* + * FreeRTOS Kernel V10.4.3 + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * https://www.FreeRTOS.org + * https://github.com/FreeRTOS + * + */ + +#ifndef FREERTOS_CONFIG_H +#define FREERTOS_CONFIG_H + +/*----------------------------------------------------------- + * Application specific definitions. + * + * These definitions should be adjusted for your particular hardware and + * application requirements. + * + * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE + * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. + * + * See http://www.freertos.org/a00110.html. + *----------------------------------------------------------*/ + +#define configUSE_PREEMPTION 1 +#define configUSE_TICKLESS_IDLE 0 +#define configCPU_CLOCK_HZ (SystemCoreClock) +#define configTICK_RATE_HZ ((TickType_t)1000) +#define configMAX_PRIORITIES 5 +#define configMINIMAL_STACK_SIZE ((unsigned short)90) +#define configMAX_TASK_NAME_LEN 20 +#define configUSE_16_BIT_TICKS 0 +#define configIDLE_SHOULD_YIELD 1 +#define configUSE_TASK_NOTIFICATIONS 1 +#define configUSE_MUTEXES 1 +#define configUSE_RECURSIVE_MUTEXES 1 +#define configUSE_COUNTING_SEMAPHORES 1 +#define configUSE_ALTERNATIVE_API 0 /* Deprecated! */ +#define configQUEUE_REGISTRY_SIZE 8 +#define configUSE_QUEUE_SETS 0 +#define configUSE_TIME_SLICING 0 +#define configUSE_NEWLIB_REENTRANT 0 +#define configENABLE_BACKWARD_COMPATIBILITY 0 +#define configNUM_THREAD_LOCAL_STORAGE_POINTERS 5 + +/* Memory allocation related definitions. */ +#define configSUPPORT_STATIC_ALLOCATION 0 +#define configSUPPORT_DYNAMIC_ALLOCATION 1 +#define configTOTAL_HEAP_SIZE ((size_t)(32 * 1024)) +#define configAPPLICATION_ALLOCATED_HEAP 0 + +/* Hook function related definitions. */ +#define configUSE_IDLE_HOOK 0 +#define configUSE_TICK_HOOK 0 +#define configCHECK_FOR_STACK_OVERFLOW 0 +#define configUSE_MALLOC_FAILED_HOOK 0 +#define configUSE_DAEMON_TASK_STARTUP_HOOK 0 + +/* Run time and task stats gathering related definitions. */ +#define configGENERATE_RUN_TIME_STATS 0 +#define configUSE_TRACE_FACILITY 1 +#define configUSE_STATS_FORMATTING_FUNCTIONS 0 + +/* Task aware debugging. */ +#define configRECORD_STACK_HIGH_ADDRESS 1 + +/* Co-routine related definitions. */ +#define configUSE_CO_ROUTINES 0 +#define configMAX_CO_ROUTINE_PRIORITIES 2 + +/* Software timer related definitions. */ +#define configUSE_TIMERS 1 +#define configTIMER_TASK_PRIORITY (configMAX_PRIORITIES - 1) +#define configTIMER_QUEUE_LENGTH 10 +#define configTIMER_TASK_STACK_DEPTH (configMINIMAL_STACK_SIZE * 2) + +/* Define to trap errors during development. */ +#define configASSERT(x) if(( x) == 0) {taskDISABLE_INTERRUPTS(); for (;;);} + +/* Optional functions - most linkers will remove unused functions anyway. */ +#define INCLUDE_vTaskPrioritySet 1 +#define INCLUDE_uxTaskPriorityGet 1 +#define INCLUDE_vTaskDelete 1 +#define INCLUDE_vTaskSuspend 1 +#define INCLUDE_vTaskDelayUntil 1 +#define INCLUDE_vTaskDelay 1 +#define INCLUDE_xTaskGetSchedulerState 1 +#define INCLUDE_xTaskGetCurrentTaskHandle 1 +#define INCLUDE_uxTaskGetStackHighWaterMark 0 +#define INCLUDE_xTaskGetIdleTaskHandle 0 +#define INCLUDE_eTaskGetState 0 +#define INCLUDE_xTimerPendFunctionCall 1 +#define INCLUDE_xTaskAbortDelay 0 +#define INCLUDE_xTaskGetHandle 0 +#define INCLUDE_xTaskResumeFromISR 1 + + + +#if defined(__ICCARM__)||defined(__CC_ARM)||defined(__GNUC__) + /* Clock manager provides in this variable system core clock frequency */ + #include + extern uint32_t SystemCoreClock; +#endif + +/* Interrupt nesting behaviour configuration. Cortex-M specific. */ +#ifdef __NVIC_PRIO_BITS +/* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */ +#define configPRIO_BITS __NVIC_PRIO_BITS +#else +#define configPRIO_BITS 4 /* 15 priority levels */ +#endif + +/* The lowest interrupt priority that can be used in a call to a "set priority" +function. */ +#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY ((1U << (configPRIO_BITS)) - 1) + +/* The highest interrupt priority that can be used by any interrupt service +routine that makes calls to interrupt safe FreeRTOS API functions. DO NOT CALL +INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER +PRIORITY THAN THIS! (higher priorities are lower numeric values. */ +#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 2 + +/* Interrupt priorities used by the kernel port layer itself. These are generic +to all Cortex-M ports, and do not rely on any particular library functions. */ +#define configKERNEL_INTERRUPT_PRIORITY (configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS)) +/* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!! +See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ +#define configMAX_SYSCALL_INTERRUPT_PRIORITY (configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS)) + +/* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS +standard names. */ +#define vPortSVCHandler SVC_Handler +#define xPortPendSVHandler PendSV_Handler +#define xPortSysTickHandler SysTick_Handler + +#endif /* FREERTOS_CONFIG_H */ diff --git a/lib/freertos b/lib/freertos new file mode 160000 index 0000000..def7d2d --- /dev/null +++ b/lib/freertos @@ -0,0 +1 @@ +Subproject commit def7d2df2b0506d3d249334974f51e427c17a41c diff --git a/lib/whd/CMakeLists.txt b/lib/whd/CMakeLists.txt new file mode 100644 index 0000000..4401b97 --- /dev/null +++ b/lib/whd/CMakeLists.txt @@ -0,0 +1,62 @@ +cmake_minimum_required(VERSION 3.10) + +project(whd) + +if(DEFINED WHD_INTERFACE) + if(WHD_INTERFACE STREQUAL "SDIO") + set(WHD_INTERFACE_DEF "CYBSP_WIFI_INTERFACE_TYPE=CYBSP_SDIO_INTERFACE") + elseif(WHD_INTERFACE STREQUAL "SPI") + set(WHD_INTERFACE_DEF "CYBSP_WIFI_INTERFACE_TYPE=CYBSP_SPI_INTERFACE") + else() + message(WARNING "Invalid WHD_INTERFACE set, using default (SDIO).") + endif() +else() + message(WARNING "No WHD_INTERFACE defined, using default (SDIO).") +endif() + +set(WHD_SOURCES + "wifi-host-driver/WiFi_Host_Driver/resources/firmware/COMPONENT_43438/43438A1_bin.c" + "wifi-host-driver/WiFi_Host_Driver/resources/firmware/COMPONENT_43438/43438A1-mfgtest_bin.c" + "wifi-host-driver/WiFi_Host_Driver/src/bus_protocols/whd_bus.c" + "wifi-host-driver/WiFi_Host_Driver/src/bus_protocols/whd_bus_common.c" + "wifi-host-driver/WiFi_Host_Driver/src/bus_protocols/whd_bus_m2m_protocol.c" + "wifi-host-driver/WiFi_Host_Driver/src/bus_protocols/whd_bus_sdio_protocol.c" + "wifi-host-driver/WiFi_Host_Driver/src/bus_protocols/whd_bus_spi_protocol.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_ap.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_buffer_api.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_cdc_bdc.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_chip.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_chip_constants.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_clm.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_debug.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_events.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_logging.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_management.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_network_if.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_resource_if.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_sdpcm.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_thread.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_utils.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_wifi.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_wifi_api.c" + "wifi-host-driver/WiFi_Host_Driver/src/whd_wifi_p2p.c" +) + +set(WHD_INCLUDES + "wifi-host-driver/External/bsp" + "wifi-host-driver/External/hal" + "wifi-host-driver/External/rtos" + "wifi-host-driver/WiFi_Host_Driver/inc" + "wifi-host-driver/WiFi_Host_Driver/src" + "wifi-host-driver/WiFi_Host_Driver/src/include" + "wifi-host-driver/WiFi_Host_Driver/resources/resource_imp" + "wifi-host-driver/WiFi_Host_Driver/resources/firmware/COMPONENT_43438" +) + +set(WHD_DEFINES + ${WHD_INTERFACE_DEF} +) + +add_library(${PROJECT_NAME} ${WHD_SOURCES}) +target_include_directories(${PROJECT_NAME} PUBLIC ${WHD_INCLUDES}) +target_compile_definitions(${PROJECT_NAME} PRIVATE ${WHD_DEFINES}) \ No newline at end of file diff --git a/lib/whd/wifi-host-driver b/lib/whd/wifi-host-driver new file mode 160000 index 0000000..9588d90 --- /dev/null +++ b/lib/whd/wifi-host-driver @@ -0,0 +1 @@ +Subproject commit 9588d908dcc6fcad1b80733dc98c624e1d649061 diff --git a/src/main.c b/src/main.c index 4c63a63..c2d3575 100644 --- a/src/main.c +++ b/src/main.c @@ -1,11 +1,22 @@ +/* Board */ #include "board.h" #include "clock_config.h" #include "peripherals.h" #include "pin_mux.h" +/* FreeRTOS */ +#include "FreeRTOS.h" +#include "task.h" + /* Debug console */ #include "fsl_debug_console.h" +/* WHD */ +#include "whd.h" +#include "whd_wifi_api.h" + +void task_hello_init(void); + int main(void) { BOARD_InitBootPins(); BOARD_InitBootClocks(); @@ -16,7 +27,11 @@ int main(void) { CLOCK_SetMode(kCLOCK_ModeRun); - PRINTF("CPU frequency: %d\r\n", CLOCK_GetCoreSysClkFreq()); + PRINTF("CPU frequency: %dMHz\r\n", CLOCK_GetCoreSysClkFreq() / 1000000); + + task_hello_init(); + + vTaskStartScheduler(); for (;;) { __WFI(); diff --git a/src/task_hello.c b/src/task_hello.c new file mode 100644 index 0000000..0ad4968 --- /dev/null +++ b/src/task_hello.c @@ -0,0 +1,17 @@ +#include "FreeRTOS.h" +#include "task.h" + +#include "fsl_debug_console.h" + +void task_hello(void *params); + +void task_hello_init(void) { + xTaskCreate(task_hello, "HELLO", 1024, NULL, 2, NULL); +} + +void task_hello(void *params) { + for(;;) { + PRINTF("Hello %d\r\n", xTaskGetTickCount()); + vTaskDelay(pdMS_TO_TICKS(1000)); + } +} \ No newline at end of file