Replace the need for taskCHECK_READY_LIST() by instead making vListRemove() return...

[freertos] / FreeRTOS / Source / timers.c

diff --git a/FreeRTOS/Source/timers.c b/FreeRTOS/Source/timers.c
index 0be2942771cc72b882c99730bdcadaedaa03fcc0..ef80cd2dda52d4c3bd75c35c53e66e0af07a6aa4 100644 (file)
--- a/FreeRTOS/Source/timers.c
+++ b/FreeRTOS/Source/timers.c
@@ -312,7 +312,7 @@ portBASE_TYPE xResult;
        /* Remove the timer from the list of active timers.  A check has already\r
        been performed to ensure the list is not empty. */\r
        pxTimer = ( xTIMER * ) listGET_OWNER_OF_HEAD_ENTRY( pxCurrentTimerList );\r
-       vListRemove( &( pxTimer->xTimerListItem ) );\r
+       uxListRemove( &( pxTimer->xTimerListItem ) );\r
        traceTIMER_EXPIRED( pxTimer );\r
 \r
        /* If the timer is an auto reload timer then calculate the next\r
@@ -526,7 +526,7 @@ portTickType xTimeNow;
                        if( listIS_CONTAINED_WITHIN( NULL, &( pxTimer->xTimerListItem ) ) == pdFALSE )\r
                        {\r
                                /* The timer is in a list, remove it. */\r
-                               vListRemove( &( pxTimer->xTimerListItem ) );\r
+                               uxListRemove( &( pxTimer->xTimerListItem ) );\r
                        }\r
                }\r
 \r
@@ -596,7 +596,7 @@ portBASE_TYPE xResult;
 \r
                /* Remove the timer from the list. */\r
                pxTimer = ( xTIMER * ) listGET_OWNER_OF_HEAD_ENTRY( pxCurrentTimerList );\r
-               vListRemove( &( pxTimer->xTimerListItem ) );\r
+               uxListRemove( &( pxTimer->xTimerListItem ) );\r
 \r
                /* Execute its callback, then send a command to restart the timer if\r
                it is an auto-reload timer.  It cannot be restarted here as the lists\r