From 2e42d7690a86465e55f1b8669431ff752c89959d Mon Sep 17 00:00:00 2001 From: Richard Barry Date: Wed, 27 Nov 2013 20:29:33 +0000 Subject: [PATCH] Continue work on new event groups functionality - fixups required by test results. --- FreeRTOS/Source/event_groups.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FreeRTOS/Source/event_groups.c b/FreeRTOS/Source/event_groups.c index 09ddbee542..70011c3886 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