Skip to content

Commit 467b4c6

Browse files
Add back more references from PR 591
1 parent b341aa0 commit 467b4c6

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

include/FreeRTOS.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,6 +1088,7 @@
10881088
#define xTaskParameters TaskParameters_t
10891089
#define xTaskStatusType TaskStatus_t
10901090
#define xTimerHandle TimerHandle_t
1091+
#define xCoRoutineHandle CoRoutineHandle_t
10911092
#define pdTASK_HOOK_CODE TaskHookFunction_t
10921093
#define portTICK_RATE_MS portTICK_PERIOD_MS
10931094
#define pcTaskGetTaskName pcTaskGetName

tasks.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2211,7 +2211,7 @@ BaseType_t xTaskResumeAll( void )
22112211
* appropriate ready list. */
22122212
while( listLIST_IS_EMPTY( &xPendingReadyList ) == pdFALSE )
22132213
{
2214-
pxTCB = listGET_OWNER_OF_HEAD_ENTRY( ( &xPendingReadyList ) ); /*lint !e9079 void * is used as this macro is used with timers too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
2214+
pxTCB = listGET_OWNER_OF_HEAD_ENTRY( ( &xPendingReadyList ) ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
22152215
listREMOVE_ITEM( &( pxTCB->xEventListItem ) );
22162216
portMEMORY_BARRIER();
22172217
listREMOVE_ITEM( &( pxTCB->xStateListItem ) );
@@ -2379,11 +2379,11 @@ char * pcTaskGetName( TaskHandle_t xTaskToQuery ) /*lint !e971 Unqualified char
23792379

23802380
if( listCURRENT_LIST_LENGTH( pxList ) > ( UBaseType_t ) 0 )
23812381
{
2382-
listGET_OWNER_OF_NEXT_ENTRY( pxFirstTCB, pxList ); /*lint !e9079 void * is used as this macro is used with timers too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
2382+
listGET_OWNER_OF_NEXT_ENTRY( pxFirstTCB, pxList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
23832383

23842384
do
23852385
{
2386-
listGET_OWNER_OF_NEXT_ENTRY( pxNextTCB, pxList ); /*lint !e9079 void * is used as this macro is used with timers too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
2386+
listGET_OWNER_OF_NEXT_ENTRY( pxNextTCB, pxList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
23872387

23882388
/* Check each character in the name looking for a match or
23892389
* mismatch. */
@@ -2832,7 +2832,7 @@ BaseType_t xTaskIncrementTick( void )
28322832
* item at the head of the delayed list. This is the time
28332833
* at which the task at the head of the delayed list must
28342834
* be removed from the Blocked state. */
2835-
pxTCB = listGET_OWNER_OF_HEAD_ENTRY( pxDelayedTaskList ); /*lint !e9079 void * is used as this macro is used with timers too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
2835+
pxTCB = listGET_OWNER_OF_HEAD_ENTRY( pxDelayedTaskList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
28362836
xItemValue = listGET_LIST_ITEM_VALUE( &( pxTCB->xStateListItem ) );
28372837

28382838
if( xConstTickCount < xItemValue )
@@ -3120,7 +3120,7 @@ void vTaskSwitchContext( void )
31203120

31213121
/* Select a new task to run using either the generic C or port
31223122
* optimised asm code. */
3123-
taskSELECT_HIGHEST_PRIORITY_TASK(); /*lint !e9079 void * is used as this macro is used with timers too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
3123+
taskSELECT_HIGHEST_PRIORITY_TASK(); /*lint !e9079 void * is used as this macro is used with timers and co-routines too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
31243124
traceTASK_SWITCHED_IN();
31253125

31263126
/* After the new task is switched in, update the global errno. */
@@ -3245,7 +3245,7 @@ BaseType_t xTaskRemoveFromEventList( const List_t * const pxEventList )
32453245
*
32463246
* This function assumes that a check has already been made to ensure that
32473247
* pxEventList is not empty. */
3248-
pxUnblockedTCB = listGET_OWNER_OF_HEAD_ENTRY( pxEventList ); /*lint !e9079 void * is used as this macro is used with timers too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
3248+
pxUnblockedTCB = listGET_OWNER_OF_HEAD_ENTRY( pxEventList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
32493249
configASSERT( pxUnblockedTCB );
32503250
listREMOVE_ITEM( &( pxUnblockedTCB->xEventListItem ) );
32513251

@@ -3309,7 +3309,7 @@ void vTaskRemoveFromUnorderedEventList( ListItem_t * pxEventListItem,
33093309

33103310
/* Remove the event list form the event flag. Interrupts do not access
33113311
* event flags. */
3312-
pxUnblockedTCB = listGET_LIST_ITEM_OWNER( pxEventListItem ); /*lint !e9079 void * is used as this macro is used with timers too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
3312+
pxUnblockedTCB = listGET_LIST_ITEM_OWNER( pxEventListItem ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
33133313
configASSERT( pxUnblockedTCB );
33143314
listREMOVE_ITEM( pxEventListItem );
33153315

@@ -3756,7 +3756,7 @@ static void prvCheckTasksWaitingTermination( void )
37563756
{
37573757
taskENTER_CRITICAL();
37583758
{
3759-
pxTCB = listGET_OWNER_OF_HEAD_ENTRY( ( &xTasksWaitingTermination ) ); /*lint !e9079 void * is used as this macro is used with timers too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
3759+
pxTCB = listGET_OWNER_OF_HEAD_ENTRY( ( &xTasksWaitingTermination ) ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
37603760
( void ) uxListRemove( &( pxTCB->xStateListItem ) );
37613761
--uxCurrentNumberOfTasks;
37623762
--uxDeletedTasksWaitingCleanUp;
@@ -3885,15 +3885,15 @@ static void prvCheckTasksWaitingTermination( void )
38853885

38863886
if( listCURRENT_LIST_LENGTH( pxList ) > ( UBaseType_t ) 0 )
38873887
{
3888-
listGET_OWNER_OF_NEXT_ENTRY( pxFirstTCB, pxList ); /*lint !e9079 void * is used as this macro is used with timers too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
3888+
listGET_OWNER_OF_NEXT_ENTRY( pxFirstTCB, pxList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
38893889

38903890
/* Populate an TaskStatus_t structure within the
38913891
* pxTaskStatusArray array for each task that is referenced from
38923892
* pxList. See the definition of TaskStatus_t in task.h for the
38933893
* meaning of each TaskStatus_t structure member. */
38943894
do
38953895
{
3896-
listGET_OWNER_OF_NEXT_ENTRY( pxNextTCB, pxList ); /*lint !e9079 void * is used as this macro is used with timers too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
3896+
listGET_OWNER_OF_NEXT_ENTRY( pxNextTCB, pxList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
38973897
vTaskGetInfo( ( TaskHandle_t ) pxNextTCB, &( pxTaskStatusArray[ uxTask ] ), pdTRUE, eState );
38983898
uxTask++;
38993899
} while( pxNextTCB != pxFirstTCB );

timers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@
565565
static void prvProcessExpiredTimer( const TickType_t xNextExpireTime,
566566
const TickType_t xTimeNow )
567567
{
568-
Timer_t * const pxTimer = ( Timer_t * ) listGET_OWNER_OF_HEAD_ENTRY( pxCurrentTimerList ); /*lint !e9087 !e9079 void * is used as this macro is used with tasks too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
568+
Timer_t * const pxTimer = ( Timer_t * ) listGET_OWNER_OF_HEAD_ENTRY( pxCurrentTimerList ); /*lint !e9087 !e9079 void * is used as this macro is used with tasks and co-routines too. Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */
569569

570570
/* Remove the timer from the list of active timers. A check has already
571571
* been performed to ensure the list is not empty. */

0 commit comments

Comments
 (0)