Continue work on new event groups functionality - fixups required by test results.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2117 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Source/event_groups.c b/FreeRTOS/Source/event_groups.c
index 09ddbee542be860d96c502e0cf0d6f253e71efa7..70011c38864cc68088aad97ac33773768a9541e1 100644 (file)
--- a/FreeRTOS/Source/event_groups.c
+++ b/FreeRTOS/Source/event_groups.c
@@ -216,7 +216,6 @@ portBASE_TYPE xYieldedAlready;
 xEventBitsType xEventGroupWaitBits( xEventGroupHandle xEventGroup, xEventBitsType uxBitsToWaitFor, portBASE_TYPE xClearOnExit, portBASE_TYPE xWaitForAllBits, portTickType xTicksToWait )\r
 {\r
 xEVENT_BITS *pxEventBits = ( xEVENT_BITS * ) xEventGroup;\r
-const xEventBitsType uxCurrentEventBits = pxEventBits->uxEventBits;\r
 xEventBitsType uxReturn, uxControlBits = 0;\r
 \r
        /* Check the user is not attempting to wait on the bits used by the kernel\r
@@ -231,6 +230,8 @@ xEventBitsType uxReturn, uxControlBits = 0;
 \r
        taskENTER_CRITICAL();\r
        {\r
+               const xEventBitsType uxCurrentEventBits = pxEventBits->uxEventBits;\r
+\r
                if( xWaitForAllBits == pdFALSE )\r
                {\r
                        /* Task only has to wait for one bit within uxBitsToWaitFor to be set.  Is\r