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
}\r
/*-----------------------------------------------------------*/\r
\r
}\r
/*-----------------------------------------------------------*/\r
\r
-static void prvTimerCallback( TaskHandle_t xExpiredTimer )\r
+static void prvTimerCallback( TimerHandle_t xExpiredTimer )\r
{\r
uint32_t ulCount;\r
\r
{\r
uint32_t ulCount;\r
\r
StaticStreamBuffer_t xStreamBufferStruct;\r
\r
\r
StaticStreamBuffer_t xStreamBufferStruct;\r
\r
\r
- xStreamBuffer = xStreamBufferCreateStatic( sizeof( ucStorageBuffer ),\r
- xTriggerLevelBytes,\r
+ xStreamBuffer = xStreamBufferCreateStatic( sizeof( ucStorageBuffer ),\r
+ xTriggerLevelBytes,\r
- &xStreamBufferStruct );\r
+ &xStreamBufferStruct );\r
#define eventEVENT_BITS_CONTROL_BYTES 0xff000000UL\r
#endif\r
\r
#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
{\r
EventBits_t uxEventBits;\r
List_t xTasksWaitingForBits; /*< List of tasks waiting for a bit to be set. */\r
traceEVENT_GROUP_CREATE_FAILED();\r
}\r
\r
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
}\r
\r
#endif /* configSUPPORT_STATIC_ALLOCATION */\r
}\r
\r
#endif /* configSUPPORT_STATIC_ALLOCATION */\r
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
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
}\r
\r
#endif /* configSUPPORT_DYNAMIC_ALLOCATION */\r
}\r
\r
#endif /* configSUPPORT_DYNAMIC_ALLOCATION */\r
EventBits_t xEventGroupSync( EventGroupHandle_t xEventGroup, const EventBits_t uxBitsToSet, const EventBits_t uxBitsToWaitFor, TickType_t xTicksToWait )\r
{\r
EventBits_t uxOriginalBitValue, uxReturn;\r
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
BaseType_t xAlreadyYielded;\r
BaseType_t xTimeoutOccurred = pdFALSE;\r
\r
\r
EventBits_t xEventGroupWaitBits( EventGroupHandle_t xEventGroup, const EventBits_t uxBitsToWaitFor, const BaseType_t xClearOnExit, const BaseType_t xWaitForAllBits, TickType_t xTicksToWait )\r
{\r
\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
EventBits_t uxReturn, uxControlBits = 0;\r
BaseType_t xWaitConditionMet, xAlreadyYielded;\r
BaseType_t xTimeoutOccurred = pdFALSE;\r
\r
EventBits_t xEventGroupClearBits( EventGroupHandle_t xEventGroup, const EventBits_t uxBitsToClear )\r
{\r
\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
EventBits_t uxReturn;\r
\r
/* Check the user is not attempting to clear the bits used by the kernel\r
EventBits_t xEventGroupGetBitsFromISR( EventGroupHandle_t xEventGroup )\r
{\r
UBaseType_t uxSavedInterruptStatus;\r
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
EventBits_t uxReturn;\r
\r
uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();\r
ListItem_t const *pxListEnd;\r
List_t const * pxList;\r
EventBits_t uxBitsToClear = 0, uxBitsWaitedFor, uxControlBits;\r
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
BaseType_t xMatchFound = pdFALSE;\r
\r
/* Check the user is not attempting to set the bits used by the kernel\r
\r
void vEventGroupDelete( EventGroupHandle_t xEventGroup )\r
{\r
\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
const List_t *pxTasksWaitingForBits = &( pxEventBits->xTasksWaitingForBits );\r
\r
vTaskSuspendAll();\r
* \defgroup EventGroupHandle_t EventGroupHandle_t\r
* \ingroup EventGroup\r
*/\r
* \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
\r
/*\r
* The type that holds event bits always matches TickType_t - therefore the\r
* \defgroup TaskHandle_t TaskHandle_t\r
* \ingroup Tasks\r
*/\r
* \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
\r
/*\r
* Defines the prototype to which the application task hook function must\r
* 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
* 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
{\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