From b3e247836e4b16da26bef339173b40434ddb33cb Mon Sep 17 00:00:00 2001
From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Sun, 7 Aug 2011 10:22:57 +0000
Subject: [PATCH] Update the names of some of the newly introduced API
 functions so they are more consistent with the names of pre-existing API
 functions.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1543 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 .../GCC/MicroBlazeV8/port_exceptions.c        |  2 +-
 Source/tasks.c                                | 32 +++++++++++--------
 Source/timers.c                               | 12 +++----
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/Source/portable/GCC/MicroBlazeV8/port_exceptions.c b/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
index f5ed3c985..e78ada6f2 100644
--- 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 
 	state when the exception occurred. */
 	xRegisterDump.xCurrentTaskHandle = pxCurrentTCB;
-	xRegisterDump.pcCurrentTaskName = pcTaskGetTaskName( NULL );
+	xRegisterDump.pcCurrentTaskName = pcTaskNameGet( NULL );
 
 	configASSERT( pulStackPointerOnFunctionEntry );
 
diff --git a/Source/tasks.c b/Source/tasks.c
index a4e494612..01d7565ec 100644
--- a/Source/tasks.c
+++ b/Source/tasks.c
@@ -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;
diff --git a/Source/timers.c b/Source/timers.c
index 2d3f3bad8..572565590 100644
--- 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. */
 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;
-- 
2.39.5