From: rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Wed, 27 Nov 2013 20:29:33 +0000 (+0000)
Subject: Continue work on new event groups functionality - fixups required by test results.
X-Git-Tag: V8.0.0rc1~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b8dfdf9b36650be7341329dfc820c56f177c5fa1;p=freertos

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 09ddbee54..70011c388 100644
--- 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 )
 {
 xEVENT_BITS *pxEventBits = ( xEVENT_BITS * ) xEventGroup;
-const xEventBitsType uxCurrentEventBits = pxEventBits->uxEventBits;
 xEventBitsType uxReturn, uxControlBits = 0;
 
 	/* Check the user is not attempting to wait on the bits used by the kernel
@@ -231,6 +230,8 @@ xEventBitsType uxReturn, uxControlBits = 0;
 
 	taskENTER_CRITICAL();
 	{
+		const xEventBitsType uxCurrentEventBits = pxEventBits->uxEventBits;
+
 		if( xWaitForAllBits == pdFALSE )
 		{
 			/* Task only has to wait for one bit within uxBitsToWaitFor to be set.  Is