Update the names of some of the newly introduced API functions so they are more consi...

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1543 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Source/portable/GCC/MicroBlazeV8/port_exceptions.c b/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
index f5ed3c98558e9687f5084f57b55bcb6e04f2ff0e..e78ada6f27b7ec7aaea72e05b388ecaa58d99dcf 100644 (file)
--- a/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
+++ b/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
@@ -135,7 +135,7 @@ extern void *pxCurrentTCB;
        /* First fill in the name and handle of the task that was in the Running \r
        state when the exception occurred. */\r
        xRegisterDump.xCurrentTaskHandle = pxCurrentTCB;\r
-       xRegisterDump.pcCurrentTaskName = pcTaskGetTaskName( NULL );\r
+       xRegisterDump.pcCurrentTaskName = pcTaskNameGet( NULL );\r
 \r
        configASSERT( pulStackPointerOnFunctionEntry );\r
 \r

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

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