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

[freertos] / FreeRTOS / Source / croutine.c

diff --git a/FreeRTOS/Source/croutine.c b/FreeRTOS/Source/croutine.c
index 0d62ca08334ac35f0300d87098434c37c106c311..7d51aedef0494769f8d83439df3beb6c3320c3fd 100644 (file)
--- a/FreeRTOS/Source/croutine.c
+++ b/FreeRTOS/Source/croutine.c
@@ -203,7 +203,7 @@ portTickType xTimeToWake;
        /* We must remove ourselves from the ready list before adding\r
        ourselves to the blocked list as the same list item is used for\r
        both lists. */\r
-       vListRemove( ( xListItem * ) &( pxCurrentCoRoutine->xGenericListItem ) );\r
+       uxListRemove( ( xListItem * ) &( pxCurrentCoRoutine->xGenericListItem ) );\r
 \r
        /* The list item will be inserted in wake time order. */\r
        listSET_LIST_ITEM_VALUE( &( pxCurrentCoRoutine->xGenericListItem ), xTimeToWake );\r
@@ -243,11 +243,11 @@ static void prvCheckPendingReadyList( void )
                portDISABLE_INTERRUPTS();\r
                {       \r
                        pxUnblockedCRCB = ( corCRCB * ) listGET_OWNER_OF_HEAD_ENTRY( (&xPendingReadyCoRoutineList) );                   \r
-                       vListRemove( &( pxUnblockedCRCB->xEventListItem ) );\r
+                       uxListRemove( &( pxUnblockedCRCB->xEventListItem ) );\r
                }\r
                portENABLE_INTERRUPTS();\r
 \r
-               vListRemove( &( pxUnblockedCRCB->xGenericListItem ) );\r
+               uxListRemove( &( pxUnblockedCRCB->xGenericListItem ) );\r
                prvAddCoRoutineToReadyQueue( pxUnblockedCRCB ); \r
        }\r
 }\r
@@ -293,12 +293,12 @@ corCRCB *pxCRCB;
                                have been moved to the pending ready list and the following\r
                                line is still valid.  Also the pvContainer parameter will have\r
                                been set to NULL so the following lines are also valid. */\r
-                               vListRemove( &( pxCRCB->xGenericListItem ) );                                                                                   \r
+                               uxListRemove( &( pxCRCB->xGenericListItem ) );                                                                                  \r
 \r
                                /* Is the co-routine waiting on an event also? */                                                                                               \r
                                if( pxCRCB->xEventListItem.pvContainer )                                                                                                        \r
                                {                                                                                                                       \r
-                                       vListRemove( &( pxCRCB->xEventListItem ) );                                                                                     \r
+                                       uxListRemove( &( pxCRCB->xEventListItem ) );                                                                                    \r
                                }\r
                        }\r
                        portENABLE_INTERRUPTS();\r
@@ -370,7 +370,7 @@ signed portBASE_TYPE xReturn;
        event lists and the pending ready list.  This function assumes that a\r
        check has already been made to ensure pxEventList is not empty. */\r
        pxUnblockedCRCB = ( corCRCB * ) listGET_OWNER_OF_HEAD_ENTRY( pxEventList );\r
-       vListRemove( &( pxUnblockedCRCB->xEventListItem ) );\r
+       uxListRemove( &( pxUnblockedCRCB->xEventListItem ) );\r
        vListInsertEnd( ( xList * ) &( xPendingReadyCoRoutineList ), &( pxUnblockedCRCB->xEventListItem ) );\r
 \r
        if( pxUnblockedCRCB->uxPriority >= pxCurrentCoRoutine->uxPriority )\r