Release candidate - this will be tagged as FreeRTOS V8.2.0rc1 and a zip file provided.

[freertos] / FreeRTOS / Source / tasks.c

diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c
index c421e521c57198793898aa98eaeb151ebe1c6939..35a7a1137e85c49807c53bf75a2d9ee0599bb6bf 100644 (file)
--- a/FreeRTOS/Source/tasks.c
+++ b/FreeRTOS/Source/tasks.c
@@ -147,7 +147,7 @@ functions but without including stdio.h here. */
 /* Value that can be assigned to the eNotifyState member of the TCB. */\r
 typedef enum\r
 {\r
-       eNotWaitingNotification,\r
+       eNotWaitingNotification = 0,\r
        eWaitingNotification,\r
        eNotified\r
 } eNotifyValue;\r
@@ -3846,7 +3846,7 @@ TickType_t uxReturn;
                                /* Mark this task as waiting for a notification. */\r
                                pxCurrentTCB->eNotifyState = eWaitingNotification;\r
 \r
-                               if( xTicksToWait > 0 )\r
+                               if( xTicksToWait > ( TickType_t ) 0 )\r
                                {\r
                                        /* The task is going to block.  First it must be removed\r
                                        from the ready list. */\r
@@ -3915,7 +3915,7 @@ TickType_t uxReturn;
                {\r
                        ulReturn = pxCurrentTCB->ulNotifiedValue;\r
 \r
-                       if( ulReturn != 0 )\r
+                       if( ulReturn != 0UL )\r
                        {\r
                                if( xClearCountOnExit != pdFALSE )\r
                                {\r
@@ -3943,7 +3943,7 @@ TickType_t uxReturn;
 \r
 #if( configUSE_TASK_NOTIFICATIONS == 1 )\r
 \r
-       BaseType_t xTaskNotifyWait( uint32_t ulBitsToClearOnEntry, BaseType_t ulBitsToClearOnExit, uint32_t *pulNotificationValue, TickType_t xTicksToWait )\r
+       BaseType_t xTaskNotifyWait( uint32_t ulBitsToClearOnEntry, uint32_t ulBitsToClearOnExit, uint32_t *pulNotificationValue, TickType_t xTicksToWait )\r
        {\r
        TickType_t xTimeToWake;\r
        BaseType_t xReturn;\r
@@ -3961,7 +3961,7 @@ TickType_t uxReturn;
                                /* Mark this task as waiting for a notification. */\r
                                pxCurrentTCB->eNotifyState = eWaitingNotification;\r
 \r
-                               if( xTicksToWait > 0 )\r
+                               if( xTicksToWait > ( TickType_t ) 0 )\r
                                {\r
                                        /* The task is going to block.  First it must be removed\r
                                        from the        ready list. */\r
@@ -4105,7 +4105,7 @@ TickType_t uxReturn;
                                        }\r
                                        break;\r
 \r
-                               default :\r
+                               case eNoAction:\r
                                        /* The task is being notified without its notify value being\r
                                        updated. */\r
                                        break;\r
@@ -4209,7 +4209,7 @@ TickType_t uxReturn;
                                        }\r
                                        break;\r
 \r
-                               default :\r
+                               case eNoAction :\r
                                        /* The task is being notified without its notify value being\r
                                        updated. */\r
                                        break;\r
@@ -4260,11 +4260,10 @@ TickType_t uxReturn;
 \r
 #if( configUSE_TASK_NOTIFICATIONS == 1 )\r
 \r
-       BaseType_t xTaskNotifyGiveFromISR( TaskHandle_t xTaskToNotify, BaseType_t *pxHigherPriorityTaskWoken )\r
+       void vTaskNotifyGiveFromISR( TaskHandle_t xTaskToNotify, BaseType_t *pxHigherPriorityTaskWoken )\r
        {\r
        TCB_t * pxTCB;\r
        eNotifyValue eOriginalNotifyState;\r
-       BaseType_t xReturn = pdPASS;\r
        UBaseType_t uxSavedInterruptStatus;\r
 \r
                configASSERT( xTaskToNotify );\r
@@ -4333,8 +4332,6 @@ TickType_t uxReturn;
                        }\r
                }\r
                portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );\r
-\r
-               return xReturn;\r
        }\r
 \r
 #endif /* configUSE_TASK_NOTIFICATIONS */\r