diff options
| author | Richard Barry <ribarry@amazon.com> | 2013-11-27 20:29:33 +0000 |
|---|---|---|
| committer | Richard Barry <ribarry@amazon.com> | 2013-11-27 20:29:33 +0000 |
| commit | 2e42d7690a86465e55f1b8669431ff752c89959d (patch) | |
| tree | 4c884836642cad6742debc03637e48e567d3c881 /FreeRTOS/Source/event_groups.c | |
| parent | d2c2e3ca6813cb14562c02852f58bb842f1ac96f (diff) | |
| download | freertos-git-2e42d7690a86465e55f1b8669431ff752c89959d.tar.gz | |
Continue work on new event groups functionality - fixups required by test results.
Diffstat (limited to 'FreeRTOS/Source/event_groups.c')
| -rw-r--r-- | FreeRTOS/Source/event_groups.c | 3 |
1 files changed, 2 insertions, 1 deletions
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
|