|
|
@@ -8,12 +8,12 @@
|
|
|
|
|
|
#include "sdkconfig.h"
|
|
|
|
|
|
-/*
|
|
|
-This file gets pulled into assembly sources. Therefore, some includes need to be wrapped in #ifndef __ASSEMBLER__
|
|
|
-*/
|
|
|
+/* This file gets pulled into assembly sources. Therefore, some includes need to
|
|
|
+ * be wrapped in #ifndef __ASSEMBLER__ */
|
|
|
|
|
|
#ifndef __ASSEMBLER__
|
|
|
-#include <assert.h> //For configASSERT()
|
|
|
+ /* For configASSERT() */
|
|
|
+ #include <assert.h>
|
|
|
#endif /* def __ASSEMBLER__ */
|
|
|
|
|
|
/* ----------------------------------------------------- Helpers -------------------------------------------------------
|
|
|
@@ -22,39 +22,40 @@ This file gets pulled into assembly sources. Therefore, some includes need to be
|
|
|
|
|
|
/* Higher stack checker modes cause overhead on each function call */
|
|
|
#if CONFIG_STACK_CHECK_ALL || CONFIG_STACK_CHECK_STRONG
|
|
|
-#define STACK_OVERHEAD_CHECKER 256
|
|
|
+ #define STACK_OVERHEAD_CHECKER 256
|
|
|
#else
|
|
|
-#define STACK_OVERHEAD_CHECKER 0
|
|
|
+ #define STACK_OVERHEAD_CHECKER 0
|
|
|
#endif
|
|
|
|
|
|
/* with optimizations disabled, scheduler uses additional stack */
|
|
|
#if CONFIG_COMPILER_OPTIMIZATION_NONE
|
|
|
-#define STACK_OVERHEAD_OPTIMIZATION 320
|
|
|
+ #define STACK_OVERHEAD_OPTIMIZATION 320
|
|
|
#else
|
|
|
-#define STACK_OVERHEAD_OPTIMIZATION 0
|
|
|
+ #define STACK_OVERHEAD_OPTIMIZATION 0
|
|
|
#endif
|
|
|
|
|
|
/* apptrace mdule increases minimum stack usage */
|
|
|
#if CONFIG_APPTRACE_ENABLE
|
|
|
-#define STACK_OVERHEAD_APPTRACE 1280
|
|
|
+ #define STACK_OVERHEAD_APPTRACE 1280
|
|
|
#else
|
|
|
-#define STACK_OVERHEAD_APPTRACE 0
|
|
|
+ #define STACK_OVERHEAD_APPTRACE 0
|
|
|
#endif
|
|
|
|
|
|
/* Stack watchpoint decreases minimum usable stack size by up to 60 bytes.
|
|
|
- See FreeRTOS FREERTOS_WATCHPOINT_END_OF_STACK option in Kconfig. */
|
|
|
+ * See FreeRTOS FREERTOS_WATCHPOINT_END_OF_STACK option in Kconfig. */
|
|
|
#if CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK
|
|
|
-#define STACK_OVERHEAD_WATCHPOINT 60
|
|
|
+ #define STACK_OVERHEAD_WATCHPOINT 60
|
|
|
#else
|
|
|
-#define STACK_OVERHEAD_WATCHPOINT 0
|
|
|
+ #define STACK_OVERHEAD_WATCHPOINT 0
|
|
|
#endif
|
|
|
|
|
|
-#define configSTACK_OVERHEAD_TOTAL ( \
|
|
|
- STACK_OVERHEAD_CHECKER + \
|
|
|
- STACK_OVERHEAD_OPTIMIZATION + \
|
|
|
- STACK_OVERHEAD_APPTRACE + \
|
|
|
- STACK_OVERHEAD_WATCHPOINT \
|
|
|
- )
|
|
|
+#define configSTACK_OVERHEAD_TOTAL \
|
|
|
+ ( \
|
|
|
+ STACK_OVERHEAD_CHECKER + \
|
|
|
+ STACK_OVERHEAD_OPTIMIZATION + \
|
|
|
+ STACK_OVERHEAD_APPTRACE + \
|
|
|
+ STACK_OVERHEAD_WATCHPOINT \
|
|
|
+ )
|
|
|
|
|
|
/* The arch-specific FreeRTOSConfig_arch.h in esp_additions/arch_include/<arch>.
|
|
|
* Placed here due to configSTACK_OVERHEAD_TOTAL. Todo: IDF-5712. */
|
|
|
@@ -69,167 +70,168 @@ This file gets pulled into assembly sources. Therefore, some includes need to be
|
|
|
* ------------------------------------------------------------------------------------------------------------------ */
|
|
|
|
|
|
/*-----------------------------------------------------------
|
|
|
- * 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
|
|
|
- *----------------------------------------------------------*/
|
|
|
-
|
|
|
-// ------------------ Scheduler Related --------------------
|
|
|
-
|
|
|
-#define configUSE_PREEMPTION 1
|
|
|
-#define configUSE_TICKLESS_IDLE CONFIG_FREERTOS_USE_TICKLESS_IDLE
|
|
|
+* 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
|
|
|
+*----------------------------------------------------------*/
|
|
|
+
|
|
|
+/* ------------------ Scheduler Related -------------------- */
|
|
|
+
|
|
|
+#define configUSE_PREEMPTION 1
|
|
|
+#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
|
|
|
-#endif //configUSE_TICKLESS_IDLE
|
|
|
-#define configCPU_CLOCK_HZ (CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ * 1000000)
|
|
|
-#define configTICK_RATE_HZ CONFIG_FREERTOS_HZ
|
|
|
-#define configUSE_TIME_SLICING 1
|
|
|
-#define configUSE_16_BIT_TICKS 0
|
|
|
-#define configIDLE_SHOULD_YIELD 0
|
|
|
-#define configKERNEL_INTERRUPT_PRIORITY 1 //Todo: This currently isn't used anywhere
|
|
|
-
|
|
|
-// ------------- Synchronization Primitives ----------------
|
|
|
-
|
|
|
-#define configUSE_MUTEXES 1
|
|
|
-#define configUSE_RECURSIVE_MUTEXES 1
|
|
|
-#define configUSE_COUNTING_SEMAPHORES 1
|
|
|
-#define configUSE_QUEUE_SETS 1
|
|
|
-#define configQUEUE_REGISTRY_SIZE CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE
|
|
|
-#define configUSE_TASK_NOTIFICATIONS 1
|
|
|
-#define configTASK_NOTIFICATION_ARRAY_ENTRIES CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES
|
|
|
-
|
|
|
-// ----------------------- System --------------------------
|
|
|
-
|
|
|
-#define configMAX_TASK_NAME_LEN CONFIG_FREERTOS_MAX_TASK_NAME_LEN
|
|
|
+ #define configEXPECTED_IDLE_TIME_BEFORE_SLEEP CONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP
|
|
|
+#endif /* configUSE_TICKLESS_IDLE */
|
|
|
+#define configCPU_CLOCK_HZ ( CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ * 1000000 )
|
|
|
+#define configTICK_RATE_HZ CONFIG_FREERTOS_HZ
|
|
|
+#define configUSE_TIME_SLICING 1
|
|
|
+#define configUSE_16_BIT_TICKS 0
|
|
|
+#define configIDLE_SHOULD_YIELD 0
|
|
|
+#define configKERNEL_INTERRUPT_PRIORITY 1 /*Todo: This currently isn't used anywhere */
|
|
|
+
|
|
|
+/* ------------- Synchronization Primitives ---------------- */
|
|
|
+
|
|
|
+#define configUSE_MUTEXES 1
|
|
|
+#define configUSE_RECURSIVE_MUTEXES 1
|
|
|
+#define configUSE_COUNTING_SEMAPHORES 1
|
|
|
+#define configUSE_QUEUE_SETS 1
|
|
|
+#define configQUEUE_REGISTRY_SIZE CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE
|
|
|
+#define configUSE_TASK_NOTIFICATIONS 1
|
|
|
+#define configTASK_NOTIFICATION_ARRAY_ENTRIES CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES
|
|
|
+
|
|
|
+/* ----------------------- System -------------------------- */
|
|
|
+
|
|
|
+#define configMAX_TASK_NAME_LEN CONFIG_FREERTOS_MAX_TASK_NAME_LEN
|
|
|
#if CONFIG_FREERTOS_SMP
|
|
|
/* Number of TLSP is doubled to store TLSP deletion callbacks */
|
|
|
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS ( CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS * 2 )
|
|
|
+ #define configNUM_THREAD_LOCAL_STORAGE_POINTERS ( CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS * 2 )
|
|
|
#else /* CONFIG_FREERTOS_SMP */
|
|
|
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS
|
|
|
+ #define configNUM_THREAD_LOCAL_STORAGE_POINTERS CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS
|
|
|
#endif /* CONFIG_FREERTOS_SMP */
|
|
|
-#define configSTACK_DEPTH_TYPE uint32_t
|
|
|
+#define configSTACK_DEPTH_TYPE uint32_t
|
|
|
#if CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY
|
|
|
-#define configENABLE_BACKWARD_COMPATIBILITY 1
|
|
|
-#else
|
|
|
-#define configENABLE_BACKWARD_COMPATIBILITY 0
|
|
|
-#endif
|
|
|
-#define configASSERT(a) assert(a)
|
|
|
+ #define configENABLE_BACKWARD_COMPATIBILITY 1
|
|
|
+#else /* CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY */
|
|
|
+ #define configENABLE_BACKWARD_COMPATIBILITY 0
|
|
|
+#endif /* CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY */
|
|
|
+#define configASSERT( a ) assert( a )
|
|
|
|
|
|
-// ----------------------- Memory -------------------------
|
|
|
+/* ----------------------- Memory ------------------------- */
|
|
|
|
|
|
-#define configSUPPORT_STATIC_ALLOCATION 1
|
|
|
-#define configSUPPORT_DYNAMIC_ALLOCATION 1
|
|
|
-#define configAPPLICATION_ALLOCATED_HEAP 1
|
|
|
-#define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP 0
|
|
|
+#define configSUPPORT_STATIC_ALLOCATION 1
|
|
|
+#define configSUPPORT_DYNAMIC_ALLOCATION 1
|
|
|
+#define configAPPLICATION_ALLOCATED_HEAP 1
|
|
|
+#define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP 0
|
|
|
|
|
|
-// ------------------------ Hooks --------------------------
|
|
|
+/* ------------------------ Hooks -------------------------- */
|
|
|
|
|
|
#if CONFIG_FREERTOS_USE_IDLE_HOOK
|
|
|
-#define configUSE_IDLE_HOOK 1
|
|
|
+ #define configUSE_IDLE_HOOK 1
|
|
|
#else /* CONFIG_FREERTOS_USE_IDLE_HOOK */
|
|
|
-#define configUSE_IDLE_HOOK 0
|
|
|
+ #define configUSE_IDLE_HOOK 0
|
|
|
#endif /* CONFIG_FREERTOS_USE_IDLE_HOOK */
|
|
|
#if CONFIG_FREERTOS_USE_TICK_HOOK
|
|
|
-#define configUSE_TICK_HOOK 1
|
|
|
+ #define configUSE_TICK_HOOK 1
|
|
|
#else /* CONFIG_FREERTOS_USE_TICK_HOOK */
|
|
|
-#define configUSE_TICK_HOOK 0
|
|
|
+ #define configUSE_TICK_HOOK 0
|
|
|
#endif /* CONFIG_FREERTOS_USE_TICK_HOOK */
|
|
|
#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
|
|
|
-#endif
|
|
|
-#define configRECORD_STACK_HIGH_ADDRESS 1 // This must be set as the port requires TCB.pxEndOfStack
|
|
|
+ #define configCHECK_FOR_STACK_OVERFLOW 2
|
|
|
+#endif /* CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE */
|
|
|
+#define configRECORD_STACK_HIGH_ADDRESS 1 /* This must be set as the port requires TCB.pxEndOfStack */
|
|
|
|
|
|
-// ------------------- Run-time Stats ----------------------
|
|
|
+/* ------------------- Run-time Stats ---------------------- */
|
|
|
|
|
|
#ifdef CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS
|
|
|
-#define configGENERATE_RUN_TIME_STATS 1 /* Used by vTaskGetRunTimeStats() */
|
|
|
-#endif
|
|
|
+ #define configGENERATE_RUN_TIME_STATS 1 /* Used by vTaskGetRunTimeStats() */
|
|
|
+#endif /* CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS */
|
|
|
#ifdef CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS
|
|
|
-#define configUSE_STATS_FORMATTING_FUNCTIONS 1 /* Used by vTaskList() */
|
|
|
-#endif
|
|
|
+ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 /* Used by vTaskList() */
|
|
|
+#endif /* CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS */
|
|
|
|
|
|
-// -------------------- Co-routines -----------------------
|
|
|
+/* -------------------- Co-routines ----------------------- */
|
|
|
|
|
|
-#define configUSE_CO_ROUTINES 0 // CO_ROUTINES are not supported in ESP-IDF
|
|
|
-#define configMAX_CO_ROUTINE_PRIORITIES 2
|
|
|
+#define configUSE_CO_ROUTINES 0 /* CO_ROUTINES are not supported in ESP-IDF */
|
|
|
+#define configMAX_CO_ROUTINE_PRIORITIES 2
|
|
|
|
|
|
-// ------------------- Software Timer ----------------------
|
|
|
+/* ------------------- Software Timer ---------------------- */
|
|
|
|
|
|
-#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
|
|
|
|
|
|
-// -------------------- API Includes -----------------------
|
|
|
+/* -------------------- API Includes ----------------------- */
|
|
|
|
|
|
#if CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY
|
|
|
-#define configENABLE_BACKWARD_COMPATIBILITY 1
|
|
|
-#else
|
|
|
-#define configENABLE_BACKWARD_COMPATIBILITY 0
|
|
|
-#endif
|
|
|
-
|
|
|
-#define INCLUDE_vTaskPrioritySet 1
|
|
|
-#define INCLUDE_uxTaskPriorityGet 1
|
|
|
-#define INCLUDE_vTaskDelete 1
|
|
|
-#define INCLUDE_vTaskSuspend 1
|
|
|
-#define INCLUDE_vTaskDelay 1
|
|
|
-#define INCLUDE_xTaskGetIdleTaskHandle 1
|
|
|
-#define INCLUDE_xTaskAbortDelay 1
|
|
|
-#define INCLUDE_xSemaphoreGetMutexHolder 1
|
|
|
-#define INCLUDE_xTaskGetHandle 1
|
|
|
-#define INCLUDE_uxTaskGetStackHighWaterMark 1
|
|
|
-#define INCLUDE_uxTaskGetStackHighWaterMark2 1
|
|
|
-#define INCLUDE_eTaskGetState 1
|
|
|
-#define INCLUDE_xTaskResumeFromISR 1
|
|
|
-#define INCLUDE_xTimerPendFunctionCall 1
|
|
|
-#define INCLUDE_xTaskGetSchedulerState 1
|
|
|
-//Unlisted
|
|
|
-#define INCLUDE_pxTaskGetStackStart 1
|
|
|
-
|
|
|
-// -------------------- Trace Macros -----------------------
|
|
|
+ #define configENABLE_BACKWARD_COMPATIBILITY 1
|
|
|
+#else /* CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY */
|
|
|
+ #define configENABLE_BACKWARD_COMPATIBILITY 0
|
|
|
+#endif /* CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY */
|
|
|
+
|
|
|
+#define INCLUDE_vTaskPrioritySet 1
|
|
|
+#define INCLUDE_uxTaskPriorityGet 1
|
|
|
+#define INCLUDE_vTaskDelete 1
|
|
|
+#define INCLUDE_vTaskSuspend 1
|
|
|
+#define INCLUDE_vTaskDelay 1
|
|
|
+#define INCLUDE_xTaskGetIdleTaskHandle 1
|
|
|
+#define INCLUDE_xTaskAbortDelay 1
|
|
|
+#define INCLUDE_xSemaphoreGetMutexHolder 1
|
|
|
+#define INCLUDE_xTaskGetHandle 1
|
|
|
+#define INCLUDE_uxTaskGetStackHighWaterMark 1
|
|
|
+#define INCLUDE_uxTaskGetStackHighWaterMark2 1
|
|
|
+#define INCLUDE_eTaskGetState 1
|
|
|
+#define INCLUDE_xTaskResumeFromISR 1
|
|
|
+#define INCLUDE_xTimerPendFunctionCall 1
|
|
|
+#define INCLUDE_xTaskGetSchedulerState 1
|
|
|
+/* Unlisted */
|
|
|
+#define INCLUDE_pxTaskGetStackStart 1
|
|
|
+
|
|
|
+/* -------------------- Trace Macros ----------------------- */
|
|
|
|
|
|
/*
|
|
|
-For trace macros.
|
|
|
-Note: Include trace macros here and not above as trace macros are dependent on some of the FreeRTOS configs
|
|
|
-*/
|
|
|
+ * For trace macros.
|
|
|
+ * Note: Include trace macros here and not above as trace macros are dependent on some of the FreeRTOS configs
|
|
|
+ */
|
|
|
#ifndef __ASSEMBLER__
|
|
|
-#if CONFIG_SYSVIEW_ENABLE
|
|
|
-#include "SEGGER_SYSVIEW_FreeRTOS.h"
|
|
|
-#undef INLINE // to avoid redefinition
|
|
|
-#endif //CONFIG_SYSVIEW_ENABLE
|
|
|
+ #if CONFIG_SYSVIEW_ENABLE
|
|
|
+ #include "SEGGER_SYSVIEW_FreeRTOS.h"
|
|
|
+ #undef INLINE /* to avoid redefinition */
|
|
|
+ #endif /* CONFIG_SYSVIEW_ENABLE */
|
|
|
+
|
|
|
+ #if CONFIG_FREERTOS_SMP
|
|
|
|
|
|
-#if CONFIG_FREERTOS_SMP
|
|
|
/* Default values for trace macros added to ESP-IDF implementation of SYSVIEW
|
|
|
* that is not part of Amazon SMP FreeRTOS. */
|
|
|
-#ifndef traceISR_EXIT
|
|
|
- #define traceISR_EXIT()
|
|
|
-#endif
|
|
|
-#ifndef traceISR_ENTER
|
|
|
- #define traceISR_ENTER(_n_)
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifndef traceQUEUE_GIVE_FROM_ISR
|
|
|
- #define traceQUEUE_GIVE_FROM_ISR( pxQueue )
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifndef traceQUEUE_GIVE_FROM_ISR_FAILED
|
|
|
- #define traceQUEUE_GIVE_FROM_ISR_FAILED( pxQueue )
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifndef traceQUEUE_SEMAPHORE_RECEIVE
|
|
|
- #define traceQUEUE_SEMAPHORE_RECEIVE( pxQueue )
|
|
|
-#endif
|
|
|
-#endif /* CONFIG_FREERTOS_SMP */
|
|
|
+ #ifndef traceISR_EXIT
|
|
|
+ #define traceISR_EXIT()
|
|
|
+ #endif
|
|
|
+ #ifndef traceISR_ENTER
|
|
|
+ #define traceISR_ENTER( _n_ )
|
|
|
+ #endif
|
|
|
+
|
|
|
+ #ifndef traceQUEUE_GIVE_FROM_ISR
|
|
|
+ #define traceQUEUE_GIVE_FROM_ISR( pxQueue )
|
|
|
+ #endif
|
|
|
+
|
|
|
+ #ifndef traceQUEUE_GIVE_FROM_ISR_FAILED
|
|
|
+ #define traceQUEUE_GIVE_FROM_ISR_FAILED( pxQueue )
|
|
|
+ #endif
|
|
|
+
|
|
|
+ #ifndef traceQUEUE_SEMAPHORE_RECEIVE
|
|
|
+ #define traceQUEUE_SEMAPHORE_RECEIVE( pxQueue )
|
|
|
+ #endif
|
|
|
+ #endif /* CONFIG_FREERTOS_SMP */
|
|
|
#endif /* def __ASSEMBLER__ */
|
|
|
|
|
|
/* ----------------------------------------------- Amazon SMP FreeRTOS -------------------------------------------------
|
|
|
@@ -237,20 +239,22 @@ Note: Include trace macros here and not above as trace macros are dependent on s
|
|
|
* ------------------------------------------------------------------------------------------------------------------ */
|
|
|
|
|
|
#if CONFIG_FREERTOS_SMP
|
|
|
-#ifdef CONFIG_FREERTOS_UNICORE
|
|
|
-#define configNUM_CORES 1
|
|
|
-#else
|
|
|
-#define configNUM_CORES 2
|
|
|
-#endif /* CONFIG_FREERTOS_UNICORE */
|
|
|
-#define configUSE_CORE_AFFINITY 1
|
|
|
-#define configRUN_MULTIPLE_PRIORITIES 1
|
|
|
-#define configUSE_TASK_PREEMPTION_DISABLE 1
|
|
|
+ #ifdef CONFIG_FREERTOS_UNICORE
|
|
|
+ #define configNUM_CORES 1
|
|
|
+ #else
|
|
|
+ #define configNUM_CORES 2
|
|
|
+ #endif /* CONFIG_FREERTOS_UNICORE */
|
|
|
+ #define configUSE_CORE_AFFINITY 1
|
|
|
+ #define configRUN_MULTIPLE_PRIORITIES 1
|
|
|
+ #define configUSE_TASK_PREEMPTION_DISABLE 1
|
|
|
+
|
|
|
/* This is always enabled to call IDF style idle hooks, by can be "--Wl,--wrap"
|
|
|
* if users enable CONFIG_FREERTOS_USE_MINIMAL_IDLE_HOOK. */
|
|
|
-#define configUSE_MINIMAL_IDLE_HOOK 1
|
|
|
+ #define configUSE_MINIMAL_IDLE_HOOK 1
|
|
|
+
|
|
|
/* IDF Newlib supports dynamic reentrancy. We provide our own __getreent()
|
|
|
* function. */
|
|
|
-#define configNEWLIB_REENTRANT_IS_DYNAMIC 1
|
|
|
+ #define configNEWLIB_REENTRANT_IS_DYNAMIC 1
|
|
|
#endif /* CONFIG_FREERTOS_SMP */
|
|
|
|
|
|
/* -------------------------------------------------- IDF FreeRTOS -----------------------------------------------------
|
|
|
@@ -258,24 +262,24 @@ Note: Include trace macros here and not above as trace macros are dependent on s
|
|
|
* ------------------------------------------------------------------------------------------------------------------ */
|
|
|
|
|
|
#if !CONFIG_FREERTOS_SMP
|
|
|
-#ifdef CONFIG_FREERTOS_UNICORE
|
|
|
-#define configNUM_CORES 1
|
|
|
-#else
|
|
|
-#define configNUM_CORES 2
|
|
|
-#endif /* CONFIG_FREERTOS_UNICORE */
|
|
|
-#ifdef CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID
|
|
|
-#define configTASKLIST_INCLUDE_COREID 1
|
|
|
-#endif /* CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID */
|
|
|
-#ifdef CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS
|
|
|
-#define configTHREAD_LOCAL_STORAGE_DELETE_CALLBACKS 1
|
|
|
-#endif /* CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS */
|
|
|
-#if CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER
|
|
|
-#define configCHECK_MUTEX_GIVEN_BY_OWNER 1
|
|
|
-#endif /* CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER */
|
|
|
+ #ifdef CONFIG_FREERTOS_UNICORE
|
|
|
+ #define configNUM_CORES 1
|
|
|
+ #else
|
|
|
+ #define configNUM_CORES 2
|
|
|
+ #endif /* CONFIG_FREERTOS_UNICORE */
|
|
|
+ #ifdef CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID
|
|
|
+ #define configTASKLIST_INCLUDE_COREID 1
|
|
|
+ #endif /* CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID */
|
|
|
+ #ifdef CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS
|
|
|
+ #define configTHREAD_LOCAL_STORAGE_DELETE_CALLBACKS 1
|
|
|
+ #endif /* CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS */
|
|
|
+ #if CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER
|
|
|
+ #define configCHECK_MUTEX_GIVEN_BY_OWNER 1
|
|
|
+ #endif /* CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER */
|
|
|
#endif /* !CONFIG_FREERTOS_SMP */
|
|
|
|
|
|
/* ------------------------------------------------ ESP-IDF Additions --------------------------------------------------
|
|
|
* - Any other macros required by the rest of ESP-IDF
|
|
|
* ------------------------------------------------------------------------------------------------------------------ */
|
|
|
|
|
|
-#define portNUM_PROCESSORS configNUM_CORES
|
|
|
+#define portNUM_PROCESSORS configNUM_CORES
|