Notes:

[freertos] / FreeRTOS / Source / include / task.h

diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h
index bd23f76c7f1594d5de2a977c14ef316fd8665068..359bf71d3af71690f8755f82f0374c1cce875d7b 100644 (file)
--- a/FreeRTOS/Source/include/task.h
+++ b/FreeRTOS/Source/include/task.h
@@ -357,7 +357,9 @@ is used in assert() statements. */
  * \defgroup xTaskCreate xTaskCreate\r
  * \ingroup Tasks\r
  */\r
-#define xTaskCreate( pvTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask ) xTaskGenericCreate( ( pvTaskCode ), ( pcName ), ( usStackDepth ), ( pvParameters ), ( uxPriority ), ( pxCreatedTask ), ( NULL ), ( NULL ), ( NULL ) )\r
+#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )\r
+       BaseType_t xTaskCreate( TaskFunction_t pxTaskCode, const char * const pcName, const uint16_t usStackDepth, void * const pvParameters, UBaseType_t uxPriority, TaskHandle_t * const pxCreatedTask ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+#endif\r
 \r
 /**\r
  * task. h\r
@@ -458,21 +460,21 @@ is used in assert() statements. */
  TaskHandle_t xHandle = NULL;\r
 \r
         // Create the task without using any dynamic memory allocation.\r
-        xTaskCreate( vTaskCode,          // As per xTaskCreate() parameter.\r
-                                 "NAME",             // As per xTaskCreate() parameter.\r
-                                 STACK_SIZE,         // As per xTaskCreate() parameter.\r
-                                 &ucParameterToPass, // As per xTaskCreate() parameter.\r
-                                 tskIDLE_PRIORITY,   // As per xTaskCreate() parameter.\r
-                                 &xHandle,           // As per xTaskCreate() parameter.\r
-                                 xStack,             // Pointer to the buffer that the task being created will use as its stack.\r
-                                 &xTaskBuffer );     // Pointer to a StaticTask_t structure for use as the memory require by the task.\r
+        xTaskCreateStatic( vTaskCode,          // As per xTaskCreate() parameter.\r
+                                       "NAME",             // As per xTaskCreate() parameter.\r
+                                       STACK_SIZE,         // As per xTaskCreate() parameter.\r
+                                       &ucParameterToPass, // As per xTaskCreate() parameter.\r
+                                       tskIDLE_PRIORITY,   // As per xTaskCreate() parameter.\r
+                                       &xHandle,           // As per xTaskCreate() parameter.\r
+                                       xStack,             // Pointer to the buffer that the task being created will use as its stack.\r
+                                       &xTaskBuffer );     // Pointer to a StaticTask_t structure for use as the memory require by the task.\r
  }\r
    </pre>\r
  * \defgroup xTaskCreateStatic xTaskCreateStatic\r
  * \ingroup Tasks\r
  */\r
 #if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
-       #define xTaskCreateStatic( pvTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask, puxStackBuffer, pxTaskBuffer ) xTaskGenericCreate( ( pvTaskCode ), ( pcName ), ( usStackDepth ), ( pvParameters ), ( uxPriority ), ( pxCreatedTask ), ( puxStackBuffer ), ( pxTaskBuffer ), ( NULL ) )\r
+       BaseType_t xTaskCreateStatic( TaskFunction_t pxTaskCode, const char * const pcName, const uint16_t usStackDepth, void * const pvParameters, UBaseType_t uxPriority, TaskHandle_t * const pxCreatedTask, StackType_t * const puxStackBuffer, StaticTask_t * const pxTaskBuffer ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
 #endif /* configSUPPORT_STATIC_ALLOCATION */\r
 \r
 /**\r
@@ -2207,12 +2209,6 @@ void vTaskPriorityInherit( TaskHandle_t const pxMutexHolder ) PRIVILEGED_FUNCTIO
  */\r
 BaseType_t xTaskPriorityDisinherit( TaskHandle_t const pxMutexHolder ) PRIVILEGED_FUNCTION;\r
 \r
-/*\r
- * Generic version of the task creation function which is in turn called by the\r
- * xTaskCreate() and xTaskCreateRestricted() macros.\r
- */\r
-BaseType_t xTaskGenericCreate( TaskFunction_t pxTaskCode, const char * const pcName, const uint16_t usStackDepth, void * const pvParameters, UBaseType_t uxPriority, TaskHandle_t * const pxCreatedTask, StackType_t * const puxStackBuffer, StaticTask_t * const pxTaskBuffer, const MemoryRegion_t * const xRegions ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
-\r
 /*\r
  * Get the uxTCBNumber assigned to the task referenced by the xTask parameter.\r
  */\r