len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 21:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Richard Barry 2013-11-27 20:29:33 +00:00
parent d2c2e3ca68
commit 2e42d7690a
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
FreeRTOS/Source/event_groups.c
View file

@ -216,7 +216,6 @@ portBASE_TYPE xYieldedAlready;
xEventBitsType xEventGroupWaitBits( xEventGroupHandle xEventGroup, xEventBitsType uxBitsToWaitFor, portBASE_TYPE xClearOnExit, portBASE_TYPE xWaitForAllBits, portTickType xTicksToWait ) xEventBitsType xEventGroupWaitBits( xEventGroupHandle xEventGroup, xEventBitsType uxBitsToWaitFor, portBASE_TYPE xClearOnExit, portBASE_TYPE xWaitForAllBits, portTickType xTicksToWait )
{ {
xEVENT_BITS *pxEventBits = ( xEVENT_BITS * ) xEventGroup; xEVENT_BITS *pxEventBits = ( xEVENT_BITS * ) xEventGroup;
const xEventBitsType uxCurrentEventBits = pxEventBits->uxEventBits;
xEventBitsType uxReturn, uxControlBits = 0; xEventBitsType uxReturn, uxControlBits = 0;
/* Check the user is not attempting to wait on the bits used by the kernel /* 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(); taskENTER_CRITICAL();
{ {
const xEventBitsType uxCurrentEventBits = pxEventBits->uxEventBits;
if( xWaitForAllBits == pdFALSE ) if( xWaitForAllBits == pdFALSE )
{ {
/* Task only has to wait for one bit within uxBitsToWaitFor to be set. Is /* Task only has to wait for one bit within uxBitsToWaitFor to be set. Is