len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-20 05:21:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prepare for V7.0.0 release.

Browse source
This commit is contained in:
Richard Barry 2011-04-08 12:06:33 +00:00
parent e5696339e7
commit 7ca26d943a
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Source/tasks.c
View file

@ -465,14 +465,14 @@ tskTCB * pxNewTCB;
pxTopOfStack = ( portSTACK_TYPE * ) ( ( ( unsigned long ) pxTopOfStack ) & ( ( unsigned long ) ~portBYTE_ALIGNMENT_MASK ) ); pxTopOfStack = ( portSTACK_TYPE * ) ( ( ( unsigned long ) pxTopOfStack ) & ( ( unsigned long ) ~portBYTE_ALIGNMENT_MASK ) );
/* Check the alignment of the calculated top of stack is correct. */ /* Check the alignment of the calculated top of stack is correct. */
configASSERT( !( ( unsigned long ) pxTopOfStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) ); configASSERT( ( ( ( unsigned long ) pxTopOfStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );
} }
#else #else
{ {
pxTopOfStack = pxNewTCB->pxStack; pxTopOfStack = pxNewTCB->pxStack;
/* Check the alignment of the stack buffer is correct. */ /* Check the alignment of the stack buffer is correct. */
configASSERT( !( ( unsigned long ) pxNewTCB->pxStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) ); configASSERT( ( ( ( unsigned long ) pxNewTCB->pxStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );
/* If we want to use stack checking on architectures that use /* If we want to use stack checking on architectures that use
a positive stack growth direction then we also need to store the a positive stack growth direction then we also need to store the
@ -499,7 +499,7 @@ tskTCB * pxNewTCB;
#endif #endif
/* Check the alignment of the initialised stack. */ /* Check the alignment of the initialised stack. */
configASSERT( !( ( unsigned long ) pxNewTCB->pxTopOfStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) ); configASSERT( ( ( ( unsigned long ) pxNewTCB->pxTopOfStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );
if( ( void * ) pxCreatedTask != NULL ) if( ( void * ) pxCreatedTask != NULL )
{ {
@ -1461,6 +1461,8 @@ unsigned portBASE_TYPE uxTaskGetNumberOfTasks( void )
void vTaskIncrementTick( void ) void vTaskIncrementTick( void )
{ {
tskTCB * pxTCB;
/* Called by the portable layer each time a tick interrupt occurs. /* Called by the portable layer each time a tick interrupt occurs.
Increments the tick then checks to see if the new tick value will cause any Increments the tick then checks to see if the new tick value will cause any
tasks to be unblocked. */ tasks to be unblocked. */
@ -1483,20 +1485,19 @@ void vTaskIncrementTick( void )
if( listLIST_IS_EMPTY( pxDelayedTaskList ) != pdFALSE ) if( listLIST_IS_EMPTY( pxDelayedTaskList ) != pdFALSE )
{ {
/* The delayed list is empty. Set xNextTaskUnblockTime to the /* The new current delayed list is empty. Set
maximum possible value so it is extremely unlikely that the xNextTaskUnblockTime to the maximum possible value so it is
if( xTickCount >= xNextTaskUnblockTime ) test will pass extremely unlikely that the
until there is an item in the delayed list. */ if( xTickCount >= xNextTaskUnblockTime ) test will pass until
there is an item in the delayed list. */
xNextTaskUnblockTime = portMAX_DELAY; xNextTaskUnblockTime = portMAX_DELAY;
} }
else else
{ {
tskTCB * pxTCB; /* The new current delayed list is not empty, get the value of
the item at the head of the delayed list. This is the time at
/* The delayed list is not empty, get the value of the item at which the task at the head of the delayed list should be removed
the head of the delayed list. This is the time at which the from the Blocked state. */
task at the head of the delayed list should be removed from
the Blocked state. */
pxTCB = ( tskTCB * ) listGET_OWNER_OF_HEAD_ENTRY( pxDelayedTaskList ); pxTCB = ( tskTCB * ) listGET_OWNER_OF_HEAD_ENTRY( pxDelayedTaskList );
xNextTaskUnblockTime = listGET_LIST_ITEM_VALUE( &( pxTCB->xGenericListItem ) ); xNextTaskUnblockTime = listGET_LIST_ITEM_VALUE( &( pxTCB->xGenericListItem ) );
} }
@ -2066,8 +2067,6 @@ static void prvInitialiseTCBVariables( tskTCB *pxTCB, const signed char * const
{ {
tskTCB *pxTCB; tskTCB *pxTCB;
configASSERT( xRegions );
if( xTaskToModify == pxCurrentTCB ) if( xTaskToModify == pxCurrentTCB )
{ {
xTaskToModify = NULL; xTaskToModify = NULL;
@ -2164,7 +2163,7 @@ static void prvAddCurrentTaskToDelayedList( portTickType xTimeToWake )
vListInsert( ( xList * ) pxDelayedTaskList, ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) ); vListInsert( ( xList * ) pxDelayedTaskList, ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) );
/* If the task entering the blocked state was placed at the head of the /* If the task entering the blocked state was placed at the head of the
list of blocked tasks then xNextTaskUnmblockTime needs to be updated list of blocked tasks then xNextTaskUnblockTime needs to be updated
too. */ too. */
if( xTimeToWake < xNextTaskUnblockTime ) if( xTimeToWake < xNextTaskUnblockTime )
{ {