diff --git a/components/freertos/include/freertos/FreeRTOSConfig.h b/components/freertos/include/freertos/FreeRTOSConfig.h index af01a30f5c..1796f1886a 100644 --- a/components/freertos/include/freertos/FreeRTOSConfig.h +++ b/components/freertos/include/freertos/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS V8.2.0 - Copyright (C) 2021 Real Time Engineers Ltd. + FreeRTOS V10 - Copyright (C) 2021 Real Time Engineers Ltd. All rights reserved VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. @@ -79,17 +79,17 @@ #endif #ifndef CONFIG_FREERTOS_UNICORE -#define portNUM_PROCESSORS 2 +#define portNUM_PROCESSORS 2 #else -#define portNUM_PROCESSORS 1 +#define portNUM_PROCESSORS 1 #endif -#define configASSERT_2 0 -#define portUSING_MPU_WRAPPERS 0 -#define configUSE_MUTEX 1 +#define configASSERT_2 0 +#define portUSING_MPU_WRAPPERS 0 +#define configUSE_MUTEX 1 #define configNUM_THREAD_LOCAL_STORAGE_POINTERS CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS -#define configTHREAD_LOCAL_STORAGE_DELETE_CALLBACKS 1 +#define configTHREAD_LOCAL_STORAGE_DELETE_CALLBACKS 1 /* configASSERT behaviour */ #ifndef __ASSEMBLER__ @@ -129,43 +129,40 @@ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. *----------------------------------------------------------*/ -#define configUSE_PREEMPTION 1 -#define configUSE_IDLE_HOOK 1 -#define configUSE_TICK_HOOK 1 -#define configRECORD_STACK_HIGH_ADDRESS 1 -#define configTICK_RATE_HZ ( CONFIG_FREERTOS_HZ ) - -/* Default clock rate for simulator */ -//#define configCPU_CLOCK_HZ 80000000 +#define configUSE_PREEMPTION 1 +#define configUSE_IDLE_HOOK 1 +#define configUSE_TICK_HOOK 1 +#define configRECORD_STACK_HIGH_ADDRESS 1 +#define configTICK_RATE_HZ ( CONFIG_FREERTOS_HZ ) /* This has impact on speed of search for highest priority */ #ifdef SMALL_TEST -#define configMAX_PRIORITIES ( 7 ) +#define configMAX_PRIORITIES ( 7 ) #else -#define configMAX_PRIORITIES ( 25 ) +#define configMAX_PRIORITIES ( 25 ) #endif /* Various things that impact minimum stack sizes */ /* Higher stack checker modes cause overhead on each function call */ #if CONFIG_STACK_CHECK_ALL || CONFIG_STACK_CHECK_STRONG -#define configSTACK_OVERHEAD_CHECKER 256 +#define configSTACK_OVERHEAD_CHECKER 256 #else -#define configSTACK_OVERHEAD_CHECKER 0 +#define configSTACK_OVERHEAD_CHECKER 0 #endif /* with optimizations disabled, scheduler uses additional stack */ #if CONFIG_COMPILER_OPTIMIZATION_NONE -#define configSTACK_OVERHEAD_OPTIMIZATION 320 +#define configSTACK_OVERHEAD_OPTIMIZATION 320 #else -#define configSTACK_OVERHEAD_OPTIMIZATION 0 +#define configSTACK_OVERHEAD_OPTIMIZATION 0 #endif /* apptrace mdule increases minimum stack usage */ #if CONFIG_APPTRACE_ENABLE -#define configSTACK_OVERHEAD_APPTRACE 1280 +#define configSTACK_OVERHEAD_APPTRACE 1280 #else -#define configSTACK_OVERHEAD_APPTRACE 0 +#define configSTACK_OVERHEAD_APPTRACE 0 #endif #define configSTACK_OVERHEAD_TOTAL ( \ @@ -174,7 +171,7 @@ configSTACK_OVERHEAD_APPTRACE \ ) -#define configMINIMAL_STACK_SIZE (768 + configSTACK_OVERHEAD_TOTAL) +#define configMINIMAL_STACK_SIZE (768 + configSTACK_OVERHEAD_TOTAL) #ifndef configIDLE_TASK_STACK_SIZE #define configIDLE_TASK_STACK_SIZE CONFIG_FREERTOS_IDLE_TASK_STACKSIZE @@ -186,75 +183,75 @@ //We define the heap to span all of the non-statically-allocated shared RAM. ToDo: Make sure there //is some space left for the app and main cpu when running outside of a thread. -#define configAPPLICATION_ALLOCATED_HEAP 1 -#define configTOTAL_HEAP_SIZE (&_heap_end - &_heap_start)//( ( size_t ) (64 * 1024) ) +#define configAPPLICATION_ALLOCATED_HEAP 1 +#define configTOTAL_HEAP_SIZE (&_heap_end - &_heap_start)//( ( size_t ) (64 * 1024) ) -#define configMAX_TASK_NAME_LEN ( CONFIG_FREERTOS_MAX_TASK_NAME_LEN ) +#define configMAX_TASK_NAME_LEN ( CONFIG_FREERTOS_MAX_TASK_NAME_LEN ) #ifdef CONFIG_FREERTOS_USE_TRACE_FACILITY -#define configUSE_TRACE_FACILITY 1 /* Used by uxTaskGetSystemState(), and other trace facility functions */ +#define configUSE_TRACE_FACILITY 1 /* Used by uxTaskGetSystemState(), and other trace facility functions */ #endif #ifdef CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS -#define configUSE_STATS_FORMATTING_FUNCTIONS 1 /* Used by vTaskList() */ +#define configUSE_STATS_FORMATTING_FUNCTIONS 1 /* Used by vTaskList() */ #endif #ifdef CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID -#define configTASKLIST_INCLUDE_COREID 1 +#define configTASKLIST_INCLUDE_COREID 1 #endif #ifdef CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS -#define configGENERATE_RUN_TIME_STATS 1 /* Used by vTaskGetRunTimeStats() */ +#define configGENERATE_RUN_TIME_STATS 1 /* Used by vTaskGetRunTimeStats() */ #endif -#define configUSE_TRACE_FACILITY_2 0 -#define configBENCHMARK 0 -#define configUSE_16_BIT_TICKS 0 -#define configIDLE_SHOULD_YIELD 0 -#define configQUEUE_REGISTRY_SIZE CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE +#define configUSE_TRACE_FACILITY_2 0 +#define configBENCHMARK 0 +#define configUSE_16_BIT_TICKS 0 +#define configIDLE_SHOULD_YIELD 0 +#define configQUEUE_REGISTRY_SIZE CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE -#define configUSE_MUTEXES 1 -#define configUSE_RECURSIVE_MUTEXES 1 -#define configUSE_COUNTING_SEMAPHORES 1 +#define configUSE_MUTEXES 1 +#define configUSE_RECURSIVE_MUTEXES 1 +#define configUSE_COUNTING_SEMAPHORES 1 #if CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE -#define configCHECK_FOR_STACK_OVERFLOW 0 +#define configCHECK_FOR_STACK_OVERFLOW 0 #elif CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL -#define configCHECK_FOR_STACK_OVERFLOW 1 +#define configCHECK_FOR_STACK_OVERFLOW 1 #elif CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY -#define configCHECK_FOR_STACK_OVERFLOW 2 +#define configCHECK_FOR_STACK_OVERFLOW 2 #endif /* Co-routine definitions. */ -#define configUSE_CO_ROUTINES 0 -#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) +#define configUSE_CO_ROUTINES 0 +#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) /* Set the following definitions to 1 to include the API function, or zero to exclude the API function. */ -#define INCLUDE_vTaskPrioritySet 1 -#define INCLUDE_uxTaskPriorityGet 1 -#define INCLUDE_vTaskDelete 1 -#define INCLUDE_vTaskCleanUpResources 0 -#define INCLUDE_vTaskSuspend 1 -#define INCLUDE_vTaskDelayUntil 1 -#define INCLUDE_vTaskDelay 1 -#define INCLUDE_uxTaskGetStackHighWaterMark 1 -#define INCLUDE_pcTaskGetTaskName 1 -#define INCLUDE_xTaskGetIdleTaskHandle 1 -#define INCLUDE_pxTaskGetStackStart 1 +#define INCLUDE_vTaskPrioritySet 1 +#define INCLUDE_uxTaskPriorityGet 1 +#define INCLUDE_vTaskDelete 1 +#define INCLUDE_vTaskCleanUpResources 0 +#define INCLUDE_vTaskSuspend 1 +#define INCLUDE_vTaskDelayUntil 1 +#define INCLUDE_vTaskDelay 1 +#define INCLUDE_uxTaskGetStackHighWaterMark 1 +#define INCLUDE_pcTaskGetTaskName 1 +#define INCLUDE_xTaskGetIdleTaskHandle 1 +#define INCLUDE_pxTaskGetStackStart 1 -#define INCLUDE_xSemaphoreGetMutexHolder 1 +#define INCLUDE_xSemaphoreGetMutexHolder 1 /* The priority at which the tick interrupt runs. This should probably be kept at 1. */ -#define configKERNEL_INTERRUPT_PRIORITY 1 +#define configKERNEL_INTERRUPT_PRIORITY 1 -#define configUSE_NEWLIB_REENTRANT 1 +#define configUSE_NEWLIB_REENTRANT 1 -#define configSUPPORT_DYNAMIC_ALLOCATION 1 -#define configSUPPORT_STATIC_ALLOCATION 1 +#define configSUPPORT_DYNAMIC_ALLOCATION 1 +#define configSUPPORT_STATIC_ALLOCATION 1 #ifndef __ASSEMBLER__ #if CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP @@ -265,26 +262,26 @@ extern void vPortCleanUpTCB ( void *pxTCB ); /* Test FreeRTOS timers (with timer task) and more. */ /* Some files don't compile if this flag is disabled */ -#define configUSE_TIMERS 1 -#define configTIMER_TASK_PRIORITY CONFIG_FREERTOS_TIMER_TASK_PRIORITY -#define configTIMER_QUEUE_LENGTH CONFIG_FREERTOS_TIMER_QUEUE_LENGTH -#define configTIMER_TASK_STACK_DEPTH CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH +#define configUSE_TIMERS 1 +#define configTIMER_TASK_PRIORITY CONFIG_FREERTOS_TIMER_TASK_PRIORITY +#define configTIMER_QUEUE_LENGTH CONFIG_FREERTOS_TIMER_QUEUE_LENGTH +#define configTIMER_TASK_STACK_DEPTH CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH -#define INCLUDE_xTimerPendFunctionCall 1 -#define INCLUDE_eTaskGetState 1 -#define configUSE_QUEUE_SETS 1 +#define INCLUDE_xTimerPendFunctionCall 1 +#define INCLUDE_eTaskGetState 1 +#define configUSE_QUEUE_SETS 1 -#define configUSE_TICKLESS_IDLE CONFIG_FREERTOS_USE_TICKLESS_IDLE +#define configUSE_TICKLESS_IDLE CONFIG_FREERTOS_USE_TICKLESS_IDLE #if configUSE_TICKLESS_IDLE -#define configEXPECTED_IDLE_TIME_BEFORE_SLEEP CONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP +#define configEXPECTED_IDLE_TIME_BEFORE_SLEEP CONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP #endif //configUSE_TICKLESS_IDLE #if CONFIG_ESP_COREDUMP_ENABLE -#define configENABLE_TASK_SNAPSHOT 1 +#define configENABLE_TASK_SNAPSHOT 1 #endif #ifndef configENABLE_TASK_SNAPSHOT -#define configENABLE_TASK_SNAPSHOT 1 +#define configENABLE_TASK_SNAPSHOT 1 #endif #if CONFIG_SYSVIEW_ENABLE @@ -295,9 +292,9 @@ extern void vPortCleanUpTCB ( void *pxTCB ); #endif #if CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER -#define configCHECK_MUTEX_GIVEN_BY_OWNER 1 +#define configCHECK_MUTEX_GIVEN_BY_OWNER 1 #else -#define configCHECK_MUTEX_GIVEN_BY_OWNER 0 +#define configCHECK_MUTEX_GIVEN_BY_OWNER 0 #endif #endif /* FREERTOS_CONFIG_H */ diff --git a/components/freertos/port/riscv/include/freertos/FreeRTOSConfig.h b/components/freertos/port/riscv/include/freertos/FreeRTOSConfig.h index dbf62dc33c..094f6f083f 100644 --- a/components/freertos/port/riscv/include/freertos/FreeRTOSConfig.h +++ b/components/freertos/port/riscv/include/freertos/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS V8.2.0 - Copyright (C) 2021 Real Time Engineers Ltd. + FreeRTOS V10 - Copyright (C) 2021 Real Time Engineers Ltd. All rights reserved VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. @@ -74,7 +74,7 @@ #include "sdkconfig.h" -#define configUSE_PORT_OPTIMISED_TASK_SELECTION 0 +#define configUSE_PORT_OPTIMISED_TASK_SELECTION 0 #ifndef __ASSEMBLER__ #if CONFIG_IDF_TARGET_ESP32C3 @@ -85,10 +85,10 @@ /* The maximum interrupt priority from which FreeRTOS.org API functions can be called. Only API functions that end in ...FromISR() can be used within interrupts. */ -#define configMAX_SYSCALL_INTERRUPT_PRIORITY 0 +#define configMAX_SYSCALL_INTERRUPT_PRIORITY 0 #ifndef configISR_STACK_SIZE -#define configISR_STACK_SIZE (CONFIG_FREERTOS_ISR_STACKSIZE) +#define configISR_STACK_SIZE (CONFIG_FREERTOS_ISR_STACKSIZE) #endif #endif // FREERTOS_CONFIG_RISCV_H diff --git a/components/freertos/port/xtensa/include/freertos/FreeRTOSConfig.h b/components/freertos/port/xtensa/include/freertos/FreeRTOSConfig.h index d7f9703e63..d16a55e470 100644 --- a/components/freertos/port/xtensa/include/freertos/FreeRTOSConfig.h +++ b/components/freertos/port/xtensa/include/freertos/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS V8.2.0 - Copyright (C) 2021 Real Time Engineers Ltd. + FreeRTOS V10 - Copyright (C) 2021 Real Time Engineers Ltd. All rights reserved VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. @@ -74,16 +74,16 @@ /* enable use of optimized task selection by the scheduler */ #ifdef CONFIG_FREERTOS_OPTIMIZED_SCHEDULER -#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1 +#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1 #endif -#define XT_USE_THREAD_SAFE_CLIB 0 +#define XT_USE_THREAD_SAFE_CLIB 0 #undef XT_USE_SWPRI #if CONFIG_FREERTOS_CORETIMER_0 -#define XT_TIMER_INDEX 0 +#define XT_TIMER_INDEX 0 #elif CONFIG_FREERTOS_CORETIMER_1 -#define XT_TIMER_INDEX 1 +#define XT_TIMER_INDEX 1 #endif #ifndef __ASSEMBLER__ @@ -133,8 +133,8 @@ int xt_clock_freq(void) __attribute__((deprecated)); #define UNTESTED_FUNCTION() #endif -#define configXT_BOARD 1 /* Board mode */ -#define configXT_SIMULATOR 0 +#define configXT_BOARD 1 /* Board mode */ +#define configXT_SIMULATOR 0 /* The maximum interrupt priority from which FreeRTOS.org API functions can be called. Only API functions that end in ...FromISR() can be used within @@ -142,7 +142,7 @@ int xt_clock_freq(void) __attribute__((deprecated)); #define configMAX_SYSCALL_INTERRUPT_PRIORITY XCHAL_EXCM_LEVEL /* Stack alignment, architecture specifc. Must be a power of two. */ -#define configSTACK_ALIGNMENT 16 +#define configSTACK_ALIGNMENT 16 /* The Xtensa port uses a separate interrupt stack. Adjust the stack size @@ -151,7 +151,7 @@ int xt_clock_freq(void) __attribute__((deprecated)); * the stack for the 2nd CPU will be calculated using configISR_STACK_SIZE. */ #ifndef configISR_STACK_SIZE -#define configISR_STACK_SIZE ((CONFIG_FREERTOS_ISR_STACKSIZE + configSTACK_ALIGNMENT - 1) & (~(configSTACK_ALIGNMENT - 1))) +#define configISR_STACK_SIZE ((CONFIG_FREERTOS_ISR_STACKSIZE + configSTACK_ALIGNMENT - 1) & (~(configSTACK_ALIGNMENT - 1))) #endif #endif // FREERTOS_CONFIG_XTENSA_H