Ensure the code builds when configSUPPORT_STATIC_ALLOCATION is 0.

[freertos] / FreeRTOS / Source / event_groups.c

diff --git a/FreeRTOS/Source/event_groups.c b/FreeRTOS/Source/event_groups.c
index 484e84042ea8d810aa191f4da3ad3f1ffe5dd9c2..246e28651e806c794300a5018ef5281f018f065a 100644 (file)
--- a/FreeRTOS/Source/event_groups.c
+++ b/FreeRTOS/Source/event_groups.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.2.2 - Copyright (C) 2015 Real Time Engineers Ltd.\r
+    FreeRTOS V8.2.3 - Copyright (C) 2015 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -8,7 +8,7 @@
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r
 \r
     ***************************************************************************\r
     >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
@@ -87,14 +87,6 @@ header files above, but not in this file, in order to generate the correct
 privileged Vs unprivileged linkage and placement. */\r
 #undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE /*lint !e961 !e750. */\r
 \r
-#if ( INCLUDE_xEventGroupSetBitFromISR == 1 ) && ( configUSE_TIMERS == 0 )\r
-       #error configUSE_TIMERS must be set to 1 to make the xEventGroupSetBitFromISR() function available.\r
-#endif\r
-\r
-#if ( INCLUDE_xEventGroupSetBitFromISR == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 0 )\r
-       #error INCLUDE_xTimerPendFunctionCall must also be set to one to make the xEventGroupSetBitFromISR() function available.\r
-#endif\r
-\r
 /* The following bit fields convey control information in a task's event list\r
 item value.  It is important they don't clash with the\r
 taskEVENT_LIST_ITEM_VALUE_IN_USE definition. */\r
@@ -119,6 +111,9 @@ typedef struct xEventGroupDefinition
                UBaseType_t uxEventGroupNumber;\r
        #endif\r
 \r
+       #if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
+               uint8_t ucStaticallyAllocated;\r
+       #endif\r
 } EventGroup_t;\r
 \r
 /*-----------------------------------------------------------*/\r
@@ -135,15 +130,40 @@ static BaseType_t prvTestWaitCondition( const EventBits_t uxCurrentEventBits, co
 \r
 /*-----------------------------------------------------------*/\r
 \r
-EventGroupHandle_t xEventGroupCreate( void )\r
+EventGroupHandle_t xEventGroupGenericCreate( StaticEventGroup_t *pxStaticEventGroup )\r
 {\r
 EventGroup_t *pxEventBits;\r
 \r
-       pxEventBits = ( EventGroup_t * ) pvPortMalloc( sizeof( EventGroup_t ) );\r
+       if( pxStaticEventGroup == NULL )\r
+       {\r
+               /* The user has not provided a statically allocated event group, so\r
+               create on dynamically. */\r
+               pxEventBits = ( EventGroup_t * ) pvPortMalloc( sizeof( EventGroup_t ) );\r
+       }\r
+       else\r
+       {\r
+               /* The user has provided a statically allocated event group - use it. */\r
+               pxEventBits = ( EventGroup_t * ) pxStaticEventGroup;\r
+       }\r
+\r
        if( pxEventBits != NULL )\r
        {\r
                pxEventBits->uxEventBits = 0;\r
                vListInitialise( &( pxEventBits->xTasksWaitingForBits ) );\r
+\r
+               #if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
+               {\r
+                       if( pxStaticEventGroup == NULL )\r
+                       {\r
+                               pxEventBits->ucStaticallyAllocated = pdFALSE;\r
+                       }\r
+                       else\r
+                       {\r
+                               pxEventBits->ucStaticallyAllocated = pdTRUE;\r
+                       }\r
+               }\r
+               #endif /* configSUPPORT_STATIC_ALLOCATION */\r
+\r
                traceEVENT_GROUP_CREATE( pxEventBits );\r
        }\r
        else\r
@@ -588,7 +608,19 @@ const List_t *pxTasksWaitingForBits = &( pxEventBits->xTasksWaitingForBits );
                        ( void ) xTaskRemoveFromUnorderedEventList( pxTasksWaitingForBits->xListEnd.pxNext, eventUNBLOCKED_DUE_TO_BIT_SET );\r
                }\r
 \r
-               vPortFree( pxEventBits );\r
+               /* Only free the memory if it was allocated dynamically. */\r
+               #if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
+               {\r
+                       if( pxEventBits->ucStaticallyAllocated == pdFALSE )\r
+                       {\r
+                               vPortFree( pxEventBits );\r
+                       }\r
+               }\r
+               #else\r
+               {\r
+                       vPortFree( pxEventBits );\r
+               }\r
+               #endif /* configSUPPORT_STATIC_ALLOCATION */\r
        }\r
        ( void ) xTaskResumeAll();\r
 }\r