Update to V5.0.0.

[freertos] / Source / tasks.c

diff --git a/Source/tasks.c b/Source/tasks.c
index 6aae804b7db195d1edb8ab8479d8ac27dee9673f..6c980959d01c1209391da1edf132b9be34f96cb5 100644 (file)
--- a/Source/tasks.c
+++ b/Source/tasks.c
@@ -1,5 +1,5 @@
 /*\r
-       FreeRTOS.org V4.8.0 - Copyright (C) 2003-2008 Richard Barry.\r
+       FreeRTOS.org V5.0.0 - Copyright (C) 2003-2008 Richard Barry.\r
 \r
        This file is part of the FreeRTOS.org distribution.\r
 \r
@@ -86,8 +86,8 @@ typedef struct tskTaskControlBlock
                unsigned portBASE_TYPE uxBasePriority;\r
        #endif\r
 \r
-       #if ( configUSE_APPLICATION_TASK_HOOK == 1 )\r
-               pdTASK_HOOK_CODE pxTaskHook;\r
+       #if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
+               pdTASK_HOOK_CODE pxTaskTag;\r
        #endif\r
                \r
 } tskTCB;\r
@@ -1391,9 +1391,9 @@ inline void vTaskIncrementTick( void )
 #endif\r
 /*-----------------------------------------------------------*/\r
 \r
-#if ( configUSE_APPLICATION_TASK_HOOK == 1 )\r
+#if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
 \r
-       void vTaskSetApplicationTaskHook( xTaskHandle xTask, pdTASK_HOOK_CODE pxHookFunction )\r
+       void vTaskSetApplicationTaskTag( xTaskHandle xTask, pdTASK_HOOK_CODE pxTagValue )\r
        {\r
        tskTCB *xTCB;\r
 \r
@@ -1408,13 +1408,15 @@ inline void vTaskIncrementTick( void )
                }\r
                \r
                /* Save the hook function in the TCB. */\r
-               xTCB->pxTaskHook = pxHookFunction;\r
+               portENTER_CRITICAL();\r
+                       xTCB->pxTaskTag = pxTagValue;\r
+               portEXIT_CRITICAL();\r
        }\r
        \r
 #endif\r
 /*-----------------------------------------------------------*/\r
 \r
-#if ( configUSE_APPLICATION_TASK_HOOK == 1 )\r
+#if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
 \r
        portBASE_TYPE xTaskCallApplicationTaskHook( xTaskHandle xTask, void *pvParameter )\r
        {\r
@@ -1431,9 +1433,9 @@ inline void vTaskIncrementTick( void )
                        xTCB = ( tskTCB * ) xTask;\r
                }\r
 \r
-               if( xTCB->pxTaskHook != NULL )\r
+               if( xTCB->pxTaskTag != NULL )\r
                {\r
-                       xReturn = xTCB->pxTaskHook( pvParameter );\r
+                       xReturn = xTCB->pxTaskTag( pvParameter );\r
                }\r
                else\r
                {\r
@@ -1759,9 +1761,9 @@ static void prvInitialiseTCBVariables( tskTCB *pxTCB, const signed portCHAR * co
        }\r
        #endif\r
 \r
-       #if ( configUSE_APPLICATION_TASK_HOOK == 1 )\r
+       #if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
        {\r
-               pxTCB->pxTaskHook = NULL;\r
+               pxTCB->pxTaskTag = NULL;\r
        }\r
        #endif  \r
 }\r