Remove casts from EventGroupHandle_t to EventGroup_t, and corresponding lint comments...

Fix the prototype of prvTimerCallback() in the MPU simulator demo (caught due to the new type safety in tasks.c).

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2543 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/main.c b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/main.c
index 40068327a4401ca92c3d42653fd00a5d6f7e5d21..d69d8d592c3691f5e8b482950f766f6101d3565c 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/main.c
+++ b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/main.c
@@ -1048,7 +1048,7 @@ void vApplicationMallocFailedHook( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvTimerCallback( TaskHandle_t xExpiredTimer )\r
+static void prvTimerCallback( TimerHandle_t xExpiredTimer )\r
 {\r
 uint32_t ulCount;\r
 \r

diff --git a/FreeRTOS/Demo/Common/Minimal/AbortDelay.c b/FreeRTOS/Demo/Common/Minimal/AbortDelay.c
index 6ee9d894eefb2bd6c98531cb7ca28d3bf65fc63c..03cef929d788aa0f4bf6110d74c62d178a85cb09 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/AbortDelay.c
+++ b/FreeRTOS/Demo/Common/Minimal/AbortDelay.c
@@ -444,10 +444,10 @@ uint8_t uxRxData;
                StaticStreamBuffer_t xStreamBufferStruct;\r
 \r
 \r
-           xStreamBuffer = xStreamBufferCreateStatic( sizeof( ucStorageBuffer ),\r
-                                                                                          xTriggerLevelBytes,\r
+               xStreamBuffer = xStreamBufferCreateStatic( sizeof( ucStorageBuffer ),\r
+                                                                                                  xTriggerLevelBytes,\r
                                                                                                   ucStorageBuffer,\r
-                                                      &xStreamBufferStruct );\r
+                                                                                                  &xStreamBufferStruct );\r
        }\r
        #else\r
        {\r

diff --git a/FreeRTOS/Source/event_groups.c b/FreeRTOS/Source/event_groups.c
index 97bf96667b60ab4fc935bba96795dfef49e80de1..51cae81ee3aec74c204e914da2075665819894e7 100644 (file)
--- a/FreeRTOS/Source/event_groups.c
+++ b/FreeRTOS/Source/event_groups.c
@@ -60,7 +60,7 @@ taskEVENT_LIST_ITEM_VALUE_IN_USE definition. */
        #define eventEVENT_BITS_CONTROL_BYTES   0xff000000UL\r
 #endif\r
 \r
-typedef struct xEventGroup\r
+typedef struct EventGroupDef_t\r
 {\r
        EventBits_t uxEventBits;\r
        List_t xTasksWaitingForBits;            /*< List of tasks waiting for a bit to be set. */\r
@@ -134,7 +134,7 @@ static BaseType_t prvTestWaitCondition( const EventBits_t uxCurrentEventBits, co
                        traceEVENT_GROUP_CREATE_FAILED();\r
                }\r
 \r
-               return ( EventGroupHandle_t ) pxEventBits; /*lint !e9087 EventGroup_t and StaticEventGroup_t are deliberately aliased for data hiding purposes and guaranteed to have the same size and alignment requirement - checked by configASSERT(). */\r
+               return pxEventBits;\r
        }\r
 \r
 #endif /* configSUPPORT_STATIC_ALLOCATION */\r
@@ -182,7 +182,7 @@ static BaseType_t prvTestWaitCondition( const EventBits_t uxCurrentEventBits, co
                        traceEVENT_GROUP_CREATE_FAILED(); /*lint !e9063 Else branch only exists to allow tracing and does not generate code if trace macros are not defined. */\r
                }\r
 \r
-               return ( EventGroupHandle_t ) pxEventBits; /*lint !e9087 EventGroupHandle_t is a pointer to an EventGroup_t, but EventGroupHandle_t is kept opaque outside of this file for data hiding purposes. */\r
+               return pxEventBits;\r
        }\r
 \r
 #endif /* configSUPPORT_DYNAMIC_ALLOCATION */\r
@@ -191,7 +191,7 @@ static BaseType_t prvTestWaitCondition( const EventBits_t uxCurrentEventBits, co
 EventBits_t xEventGroupSync( EventGroupHandle_t xEventGroup, const EventBits_t uxBitsToSet, const EventBits_t uxBitsToWaitFor, TickType_t xTicksToWait )\r
 {\r
 EventBits_t uxOriginalBitValue, uxReturn;\r
-EventGroup_t *pxEventBits = ( EventGroup_t * ) xEventGroup; /*lint !e9087 !e9079 EventGroupHandle_t is a pointer to an EventGroup_t.  It is opaque outside of this file for data hiding purposes. */\r
+EventGroup_t *pxEventBits = xEventGroup;\r
 BaseType_t xAlreadyYielded;\r
 BaseType_t xTimeoutOccurred = pdFALSE;\r
 \r
@@ -310,7 +310,7 @@ BaseType_t xTimeoutOccurred = pdFALSE;
 \r
 EventBits_t xEventGroupWaitBits( EventGroupHandle_t xEventGroup, const EventBits_t uxBitsToWaitFor, const BaseType_t xClearOnExit, const BaseType_t xWaitForAllBits, TickType_t xTicksToWait )\r
 {\r
-EventGroup_t *pxEventBits = ( EventGroup_t * ) xEventGroup; /*lint !e9087 !e9079 EventGroupHandle_t is a pointer to an EventGroup_t.  It is opaque outside of this file for data hiding purposes. */\r
+EventGroup_t *pxEventBits = xEventGroup;\r
 EventBits_t uxReturn, uxControlBits = 0;\r
 BaseType_t xWaitConditionMet, xAlreadyYielded;\r
 BaseType_t xTimeoutOccurred = pdFALSE;\r
@@ -460,7 +460,7 @@ BaseType_t xTimeoutOccurred = pdFALSE;
 \r
 EventBits_t xEventGroupClearBits( EventGroupHandle_t xEventGroup, const EventBits_t uxBitsToClear )\r
 {\r
-EventGroup_t *pxEventBits = ( EventGroup_t * ) xEventGroup; /*lint !e9087 !e9079 EventGroupHandle_t is a pointer to an EventGroup_t, but EventGroupHandle_t is kept opaque outside of this file for data hiding purposes. */\r
+EventGroup_t *pxEventBits = xEventGroup;\r
 EventBits_t uxReturn;\r
 \r
        /* Check the user is not attempting to clear the bits used by the kernel\r
@@ -503,7 +503,7 @@ EventBits_t uxReturn;
 EventBits_t xEventGroupGetBitsFromISR( EventGroupHandle_t xEventGroup )\r
 {\r
 UBaseType_t uxSavedInterruptStatus;\r
-EventGroup_t const * const pxEventBits = ( EventGroup_t * ) xEventGroup; /*lint !e9087 !e9079 EventGroupHandle_t is a pointer to an EventGroup_t, but EventGroupHandle_t is kept opaque outside of this file for data hiding purposes. */\r
+EventGroup_t const * const pxEventBits = xEventGroup;\r
 EventBits_t uxReturn;\r
 \r
        uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();\r
@@ -522,7 +522,7 @@ ListItem_t *pxListItem, *pxNext;
 ListItem_t const *pxListEnd;\r
 List_t const * pxList;\r
 EventBits_t uxBitsToClear = 0, uxBitsWaitedFor, uxControlBits;\r
-EventGroup_t *pxEventBits = ( EventGroup_t * ) xEventGroup; /*lint !e9087 !e9079 EventGroupHandle_t is a pointer to an EventGroup_t, but EventGroupHandle_t is kept opaque outside of this file for data hiding purposes. */\r
+EventGroup_t *pxEventBits = xEventGroup;\r
 BaseType_t xMatchFound = pdFALSE;\r
 \r
        /* Check the user is not attempting to set the bits used by the kernel\r
@@ -612,7 +612,7 @@ BaseType_t xMatchFound = pdFALSE;
 \r
 void vEventGroupDelete( EventGroupHandle_t xEventGroup )\r
 {\r
-EventGroup_t *pxEventBits = ( EventGroup_t * ) xEventGroup; /*lint !e9087 !e9079 EventGroupHandle_t is a pointer to an EventGroup_t, but EventGroupHandle_t is kept opaque outside of this file for data hiding purposes. */\r
+EventGroup_t *pxEventBits = xEventGroup;\r
 const List_t *pxTasksWaitingForBits = &( pxEventBits->xTasksWaitingForBits );\r
 \r
        vTaskSuspendAll();\r

diff --git a/FreeRTOS/Source/include/event_groups.h b/FreeRTOS/Source/include/event_groups.h
index b93c0ec6dbccfcfe9f1d8f8168d288a9635f20c1..c758237952c104d0c3547ab6bc70a220aea5586c 100644 (file)
--- a/FreeRTOS/Source/include/event_groups.h
+++ b/FreeRTOS/Source/include/event_groups.h
@@ -78,8 +78,8 @@ extern "C" {
  * \defgroup EventGroupHandle_t EventGroupHandle_t\r
  * \ingroup EventGroup\r
  */\r
-struct xEventGroup;\r
-typedef struct xEventGroup * EventGroupHandle_t;\r
+struct EventGroupDef_t;\r
+typedef struct EventGroupDef_t * EventGroupHandle_t;\r
 \r
 /*\r
  * The type that holds event bits always matches TickType_t - therefore the\r

diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h
index 7d0bf1fc5ab58bed5c372f6865490777828e7da7..8b40fcdc2ae1e87fd76644a7167cb340219e8d8c 100644 (file)
--- a/FreeRTOS/Source/include/task.h
+++ b/FreeRTOS/Source/include/task.h
@@ -58,8 +58,8 @@ extern "C" {
  * \defgroup TaskHandle_t TaskHandle_t\r
  * \ingroup Tasks\r
  */\r
-struct xTaskControlBlock;\r
-typedef struct xTaskControlBlock* TaskHandle_t;\r
+struct TaskControlBlock_t;\r
+typedef struct TaskControlBlock_t* TaskHandle_t;\r
 \r
 /*\r
  * Defines the prototype to which the application task hook function must\r

diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c
index 3a262fd7a7b60fe449e38679e0e7808c6b91571e..dc022d7b040b6b804363fb2779a1f37397605a9b 100644 (file)
--- a/FreeRTOS/Source/tasks.c
+++ b/FreeRTOS/Source/tasks.c
@@ -266,7 +266,7 @@ to its original value when it is released. */
  * and stores task state information, including a pointer to the task's context\r
  * (the task's run time environment, including register values)\r
  */\r
-typedef struct xTaskControlBlock\r
+typedef struct TaskControlBlock_t\r
 {\r
        volatile StackType_t    *pxTopOfStack;  /*< Points to the location of the last item placed on the tasks stack.  THIS MUST BE THE FIRST MEMBER OF THE TCB STRUCT. */\r
 \r