Add vTaskGetTaskInfo() function that allows a TaskStatus_t structure to be returned...

[freertos] / FreeRTOS / Source / event_groups.c

diff --git a/FreeRTOS/Source/event_groups.c b/FreeRTOS/Source/event_groups.c
index e8fe1a7fbb96221738af8b0b654a46a0c001c9fd..246e28651e806c794300a5018ef5281f018f065a 100644 (file)
--- a/FreeRTOS/Source/event_groups.c
+++ b/FreeRTOS/Source/event_groups.c
@@ -111,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
@@ -127,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
@@ -580,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