Default configUSE_TICKLESS_IDLE to 0 when it is not defined.

Move location of traceTASK_CREATE() macro call.
Remove obsolete handling of trmCOMMAND_PROCESS_TIMER_OVERFLOW as the command was never used in release versions.
This commit is contained in:
Richard Barry 2012-11-17 19:23:30 +00:00
parent c4d078c29a
commit 0d421482d8
3 changed files with 9 additions and 11 deletions

View file

@ -534,6 +534,10 @@ typedef portBASE_TYPE (*pdTASK_HOOK_CODE)( void * );
#define portSUPPRESS_TICKS_AND_SLEEP( xExpectedIdleTime ) #define portSUPPRESS_TICKS_AND_SLEEP( xExpectedIdleTime )
#endif #endif
#ifndef configUSE_TICKLESS_IDLE
#define configUSE_TICKLESS_IDLE 0
#endif
#ifndef configPRE_SLEEP_PROCESSING #ifndef configPRE_SLEEP_PROCESSING
#define configPRE_SLEEP_PROCESSING( x ) #define configPRE_SLEEP_PROCESSING( x )
#endif #endif

View file

@ -614,12 +614,12 @@ tskTCB * pxNewTCB;
} }
#endif #endif
uxTaskNumber++; uxTaskNumber++;
traceTASK_CREATE( pxNewTCB );
prvAddTaskToReadyQueue( pxNewTCB ); prvAddTaskToReadyQueue( pxNewTCB );
xReturn = pdPASS; xReturn = pdPASS;
portSETUP_TCB( pxNewTCB ); portSETUP_TCB( pxNewTCB );
traceTASK_CREATE( pxNewTCB );
} }
taskEXIT_CRITICAL(); taskEXIT_CRITICAL();
} }

View file

@ -520,17 +520,11 @@ portTickType xTimeNow;
{ {
pxTimer = xMessage.pxTimer; pxTimer = xMessage.pxTimer;
/* Is the timer already in a list of active timers? When the command
is trmCOMMAND_PROCESS_TIMER_OVERFLOW, the timer will be NULL as the
command is to the task rather than to an individual timer. */
if( pxTimer != NULL )
{
if( listIS_CONTAINED_WITHIN( NULL, &( pxTimer->xTimerListItem ) ) == pdFALSE ) if( listIS_CONTAINED_WITHIN( NULL, &( pxTimer->xTimerListItem ) ) == pdFALSE )
{ {
/* The timer is in a list, remove it. */ /* The timer is in a list, remove it. */
uxListRemove( &( pxTimer->xTimerListItem ) ); uxListRemove( &( pxTimer->xTimerListItem ) );
} }
}
traceTIMER_COMMAND_RECEIVED( pxTimer, xMessage.xMessageID, xMessage.xMessageValue ); traceTIMER_COMMAND_RECEIVED( pxTimer, xMessage.xMessageID, xMessage.xMessageValue );