Update the names of some of the newly introduced API functions so they are more consistent with the names of pre-existing API functions.

pull/4/head
Richard Barry 14 years ago
parent 28629a7ea6
commit 3a25b5f33b

@ -135,7 +135,7 @@ extern void *pxCurrentTCB;
/* First fill in the name and handle of the task that was in the Running
state when the exception occurred. */
xRegisterDump.xCurrentTaskHandle = pxCurrentTCB;
xRegisterDump.pcCurrentTaskName = pcTaskGetTaskName( NULL );
xRegisterDump.pcCurrentTaskName = pcTaskNameGet( NULL );
configASSERT( pulStackPointerOnFunctionEntry );

@ -157,7 +157,7 @@ PRIVILEGED_DATA static xList xPendingReadyList; /*< Tasks that have been r
#endif
#if ( INCLUDE_xTaskGetIdleTaskHandle == 1 )
#if ( INCLUDE_xTaskIdleTaskHandleGet == 1 )
PRIVILEGED_DATA static xTaskHandle xIdleTaskHandle = NULL;
@ -1096,10 +1096,10 @@ void vTaskStartScheduler( void )
portBASE_TYPE xReturn;
/* Add the idle task at the lowest priority. */
#if ( INCLUDE_xTaskGetIdleTaskHandle == 1 )
#if ( INCLUDE_xTaskIdleTaskHandleGet == 1 )
{
/* Create the idle task, storing its handle in xIdleTaskHandle so it can
be returned by the xTaskGetIdleTaskHandle() function. */
be returned by the xTaskIdleTaskHandleGet() function. */
xReturn = xTaskCreate( prvIdleTask, ( signed char * ) "IDLE", tskIDLE_STACK_SIZE, ( void * ) NULL, ( tskIDLE_PRIORITY | portPRIVILEGE_BIT ), &xIdleTaskHandle );
}
#else
@ -1298,15 +1298,19 @@ unsigned portBASE_TYPE uxTaskGetNumberOfTasks( void )
}
/*-----------------------------------------------------------*/
signed char *pcTaskGetTaskName( xTaskHandle xTaskToQuery )
{
tskTCB *pxTCB;
#if ( INCLUDE_pcTaskNameGet == 1 )
/* If null is passed in here then the name of the calling task is being queried. */
pxTCB = prvGetTCBFromHandle( xTaskToQuery );
configASSERT( pxTCB );
return &( pxTCB->pcTaskName[ 0 ] );
}
signed char *pcTaskNameGet( xTaskHandle xTaskToQuery )
{
tskTCB *pxTCB;
/* If null is passed in here then the name of the calling task is being queried. */
pxTCB = prvGetTCBFromHandle( xTaskToQuery );
configASSERT( pxTCB );
return &( pxTCB->pcTaskName[ 0 ] );
}
#endif
/*-----------------------------------------------------------*/
#if ( configUSE_TRACE_FACILITY == 1 )
@ -1485,11 +1489,11 @@ tskTCB *pxTCB;
#endif
/*----------------------------------------------------------*/
#if ( INCLUDE_xTaskGetIdleTaskHandle == 1 )
#if ( INCLUDE_xTaskIdleTaskHandleGet == 1 )
xTaskHandle xTaskGetIdleTaskHandle( void )
xTaskHandle xTaskIdleTaskHandleGet( void )
{
/* If xTaskGetIdleTaskHandle() is called before the scheduler has been
/* If xTaskIdleTaskHandleGet() is called before the scheduler has been
started, then xIdleTaskHandle will be NULL. */
configASSERT( ( xIdleTaskHandle != NULL ) );
return xIdleTaskHandle;

@ -110,7 +110,7 @@ PRIVILEGED_DATA static xList *pxOverflowTimerList;
/* A queue that is used to send commands to the timer service task. */
PRIVILEGED_DATA static xQueueHandle xTimerQueue = NULL;
#if ( INCLUDE_xTimerGetTimerTaskHandle == 1 )
#if ( INCLUDE_xTimerDaemonTaskHandleGet == 1 )
PRIVILEGED_DATA static xTaskHandle xTimerTaskHandle = NULL;
@ -189,10 +189,10 @@ portBASE_TYPE xReturn = pdFAIL;
if( xTimerQueue != NULL )
{
#if ( INCLUDE_xTimerGetTimerTaskHandle == 1 )
#if ( INCLUDE_xTimerDaemonTaskHandleGet == 1 )
{
/* Create the timer task, storing its handle in xTimerTaskHandle so
it can be returned by the xTimerGetTimerTaskHandle() function. */
it can be returned by the xTimerDaemonTaskHandleGet() function. */
xReturn = xTaskCreate( prvTimerTask, ( const signed char * ) "Tmr Svc", ( unsigned short ) configTIMER_TASK_STACK_DEPTH, NULL, ( unsigned portBASE_TYPE ) configTIMER_TASK_PRIORITY, &xTimerTaskHandle );
}
#else
@ -284,11 +284,11 @@ xTIMER_MESSAGE xMessage;
}
/*-----------------------------------------------------------*/
#if ( INCLUDE_xTimerGetTimerTaskHandle == 1 )
#if ( INCLUDE_xTimerDaemonTaskHandleGet == 1 )
xTaskHandle xTimerGetTimerTaskHandle( void )
xTaskHandle xTimerDaemonTaskHandleGet( void )
{
/* If xTimerGetTimerTaskHandle() is called before the scheduler has been
/* If xTimerDaemonTaskHandleGet() is called before the scheduler has been
started, then xTimerTaskHandle will be NULL. */
configASSERT( ( xTimerTaskHandle != NULL ) );
return xTimerTaskHandle;

Loading…
Cancel
Save