freertos: Refactor configuration files

This commit refactors the FreeRTOS configuration headers as follows:

- Layout is now similar to FreeRTOSConfig.h found in other upstream demos
- Separate out Vanilla FreeRTOS configurations and ESP-IDF additions
- Move/remove some irrelevant/unused macros and configurations

components/freertos/FreeRTOS-Kernel/include/freertos/FreeRTOS.h

@@ -499,12 +499,6 @@
     #define traceQUEUE_SET_SEND    traceQUEUE_SEND
 #endif
 
-#ifdef ESP_PLATFORM
-#ifndef traceQUEUE_SEMAPHORE_RECEIVE
-    #define traceQUEUE_SEMAPHORE_RECEIVE( pxQueue )
-#endif
-#endif // ESP_PLATFORM
-
 #ifndef traceQUEUE_SEND
     #define traceQUEUE_SEND( pxQueue )
 #endif
@@ -557,16 +551,6 @@
     #define traceQUEUE_DELETE( pxQueue )
 #endif
 
-#ifdef ESP_PLATFORM
-#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
-#endif // ESP_PLATFORM
-
 #ifndef traceTASK_CREATE
     #define traceTASK_CREATE( pxNewTCB )
 #endif
@@ -771,6 +755,9 @@
     #define traceSTREAM_BUFFER_RECEIVE_FROM_ISR( xStreamBuffer, xReceivedLength )
 #endif
 
+/*
+Default values for trace macros added by ESP-IDF and are not part of Vanilla FreeRTOS
+*/
 #ifdef ESP_PLATFORM
 #ifndef traceISR_EXIT_TO_SCHEDULER
     #define traceISR_EXIT_TO_SCHEDULER()
@@ -783,6 +770,18 @@
 #ifndef traceISR_ENTER
     #define traceISR_ENTER(_n_)
 #endif
+
+#ifndef traceQUEUE_SEMAPHORE_RECEIVE
+    #define traceQUEUE_SEMAPHORE_RECEIVE( pxQueue )
+#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
 #endif // ESP_PLATFORM
 
 #ifndef configGENERATE_RUN_TIME_STATS
@@ -977,8 +976,8 @@
 /* Either variables of tick type cannot be read atomically, or
  * portTICK_TYPE_IS_ATOMIC was not set - map the critical sections used when
  * the tick count is returned to the standard critical section macros. */
-    #define portTICK_TYPE_ENTER_CRITICAL(mux) portENTER_CRITICAL(mux)
-    #define portTICK_TYPE_EXIT_CRITICAL(mux) portEXIT_CRITICAL(mux)
+    #define portTICK_TYPE_ENTER_CRITICAL()                      portENTER_CRITICAL()
+    #define portTICK_TYPE_EXIT_CRITICAL()                       portEXIT_CRITICAL()
     #define portTICK_TYPE_SET_INTERRUPT_MASK_FROM_ISR()         portSET_INTERRUPT_MASK_FROM_ISR()
     #define portTICK_TYPE_CLEAR_INTERRUPT_MASK_FROM_ISR( x )    portCLEAR_INTERRUPT_MASK_FROM_ISR( ( x ) )
 #else
@@ -1060,12 +1059,6 @@
     #define pxContainer                   pvContainer
 #endif /* configENABLE_BACKWARD_COMPATIBILITY */
 
-#ifdef ESP_PLATFORM
-#ifndef configESP32_PER_TASK_DATA
-    #define configESP32_PER_TASK_DATA 1
-#endif
-#endif // ESP_PLATFORM
-
 #if ( configUSE_ALTERNATIVE_API != 0 )
     #error The alternative API was deprecated some time ago, and was removed in FreeRTOS V9.0 0
 #endif

components/freertos/FreeRTOS-Kernel/include/freertos/portable.h

@@ -136,7 +136,7 @@
                                              TaskFunction_t pxCode,
                                              void * pvParameters ) PRIVILEGED_FUNCTION;
     #endif
-#endif
+#endif /* if ( portUSING_MPU_WRAPPERS == 1 ) */
 
 #ifdef configUSE_FREERTOS_PROVIDED_HEAP
 

components/freertos/FreeRTOS-Kernel/include/freertos/timers.h

@@ -454,12 +454,7 @@ void vTimerSetTimerID( TimerHandle_t xTimer,
 BaseType_t xTimerIsTimerActive( TimerHandle_t xTimer ) PRIVILEGED_FUNCTION;
 
 /**
- * @cond !DOC_EXCLUDE_HEADER_SECTION
  * TaskHandle_t xTimerGetTimerDaemonTaskHandle( void );
- * @endcond
- *
- * xTimerGetTimerDaemonTaskHandle() is only available if
- * INCLUDE_xTimerGetTimerDaemonTaskHandle is set to 1 in FreeRTOSConfig.h.
  *
  * Simply returns the handle of the timer service/daemon task.  It it not valid
  * to call xTimerGetTimerDaemonTaskHandle() before the scheduler has been started.