Make the pcObjectGetName() API function naming consistent - so rename pcTaskGetTaskNa...

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

diff --git a/FreeRTOS/Source/include/FreeRTOS.h b/FreeRTOS/Source/include/FreeRTOS.h
index 8b8efca2410ab15aaa2d65b8caff8a82c47c092c..9f742825d042dade1c077710be4d8707dfa26105 100644 (file)
--- a/FreeRTOS/Source/include/FreeRTOS.h
+++ b/FreeRTOS/Source/include/FreeRTOS.h
@@ -181,10 +181,6 @@ extern "C" {
        #define INCLUDE_xSemaphoreGetMutexHolder INCLUDE_xQueueGetMutexHolder\r
 #endif\r
 \r
-#ifndef INCLUDE_pcTaskGetTaskName\r
-       #define INCLUDE_pcTaskGetTaskName 0\r
-#endif\r
-\r
 #ifndef INCLUDE_xTaskGetTaskHandle\r
        #define INCLUDE_xTaskGetTaskHandle 0\r
 #endif\r
@@ -318,7 +314,7 @@ extern "C" {
 #if ( configQUEUE_REGISTRY_SIZE < 1 )\r
        #define vQueueAddToRegistry( xQueue, pcName )\r
        #define vQueueUnregisterQueue( xQueue )\r
-       #define pcQueueGetQueueName( xQueue )\r
+       #define pcQueueGetName( xQueue )\r
 #endif\r
 \r
 #ifndef portPOINTER_SIZE_TYPE\r
@@ -839,6 +835,8 @@ V8 if desired. */
        #define xCoRoutineHandle CoRoutineHandle_t\r
        #define pdTASK_HOOK_CODE TaskHookFunction_t\r
        #define portTICK_RATE_MS portTICK_PERIOD_MS\r
+       #define pcTaskGetTaskName pcTaskGetName\r
+       #define pcTimerGetTimerName pcTimerGetName\r
 \r
        /* Backward compatibility within the scheduler code only - these definitions\r
        are not really required but are included for completeness. */\r

diff --git a/FreeRTOS/Source/include/mpu_wrappers.h b/FreeRTOS/Source/include/mpu_wrappers.h
index 7ce1c4162c2ac621c568316be10716f2b74f32ea..4a56b37d96f280ad143b9a6505a6c469231d777a 100644 (file)
--- a/FreeRTOS/Source/include/mpu_wrappers.h
+++ b/FreeRTOS/Source/include/mpu_wrappers.h
@@ -143,7 +143,7 @@ only for ports that are using the MPU. */
                #define xTimerIsTimerActive                             MPU_xTimerIsTimerActive\r
                #define xTimerGetTimerDaemonTaskHandle  MPU_xTimerGetTimerDaemonTaskHandle\r
                #define xTimerPendFunctionCall                  MPU_xTimerPendFunctionCall\r
-               #define pcTimerGetTimerName                             MPU_pcTimerGetTimerName\r
+               #define pcTimerGetName                                  MPU_pcTimerGetName\r
                #define xTimerGenericCommand                    MPU_xTimerGenericCommand\r
 \r
                #define xEventGroupCreate                               MPU_xEventGroupCreate\r

diff --git a/FreeRTOS/Source/include/queue.h b/FreeRTOS/Source/include/queue.h
index 4ff7aa8d5aaa9bc5106d73f038809d7d75090e63..21d9e5f125e6d1ba32471c044c920ceb553ff153 100644 (file)
--- a/FreeRTOS/Source/include/queue.h
+++ b/FreeRTOS/Source/include/queue.h
@@ -1617,7 +1617,7 @@ BaseType_t xQueueGiveMutexRecursive( QueueHandle_t pxMutex ) PRIVILEGED_FUNCTION
 \r
 /*\r
  * The queue registry is provided as a means for kernel aware debuggers to\r
- * locate queues, semaphores and mutexes.  Call pcQueueGetQueueName() to look\r
+ * locate queues, semaphores and mutexes.  Call pcQueueGetName() to look\r
  * up and return the name of a queue in the queue registry from the queue's\r
  * handle.\r
  *\r
@@ -1627,7 +1627,7 @@ BaseType_t xQueueGiveMutexRecursive( QueueHandle_t pxMutex ) PRIVILEGED_FUNCTION
  * returned.\r
  */\r
 #if( configQUEUE_REGISTRY_SIZE > 0 )\r
-       const char *pcQueueGetQueueName( QueueHandle_t xQueue ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+       const char *pcQueueGetName( QueueHandle_t xQueue ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
 #endif\r
 \r
 /*\r

diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h
index 7af7a2e76af200572a5bf8c83d42428106236051..f546e1596f5be666043e21325cfd8dac0733222c 100644 (file)
--- a/FreeRTOS/Source/include/task.h
+++ b/FreeRTOS/Source/include/task.h
@@ -416,7 +416,7 @@ is used in assert() statements. */
  *\r
  * @return If neither pxStackBuffer or pxTaskBuffer are NULL, then the task will\r
  * be created and pdPASS is returned.  If either pxStackBuffer or pxTaskBuffer\r
- * are NULL then the task will not be created and \r
+ * are NULL then the task will not be created and\r
  * errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY is returned.\r
  *\r
  * Example usage:\r
@@ -1302,17 +1302,16 @@ UBaseType_t uxTaskGetNumberOfTasks( void ) PRIVILEGED_FUNCTION;
 \r
 /**\r
  * task. h\r
- * <PRE>char *pcTaskGetTaskName( TaskHandle_t xTaskToQuery );</PRE>\r
+ * <PRE>char *pcTaskGetName( TaskHandle_t xTaskToQuery );</PRE>\r
  *\r
  * @return The text (human readable) name of the task referenced by the handle\r
  * xTaskToQuery.  A task can query its own name by either passing in its own\r
- * handle, or by setting xTaskToQuery to NULL.  INCLUDE_pcTaskGetTaskName must be\r
- * set to 1 in FreeRTOSConfig.h for pcTaskGetTaskName() to be available.\r
+ * handle, or by setting xTaskToQuery to NULL.\r
  *\r
- * \defgroup pcTaskGetTaskName pcTaskGetTaskName\r
+ * \defgroup pcTaskGetName pcTaskGetName\r
  * \ingroup TaskUtils\r
  */\r
-char *pcTaskGetTaskName( TaskHandle_t xTaskToQuery ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+char *pcTaskGetName( TaskHandle_t xTaskToQuery ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
 \r
 /**\r
  * task. h\r

diff --git a/FreeRTOS/Source/include/timers.h b/FreeRTOS/Source/include/timers.h
index cbf9bc0b8026260dd52a86024a528606121894ea..1e029dbf60cf0aba5928cce3f78c8b864e51a0e7 100644 (file)
--- a/FreeRTOS/Source/include/timers.h
+++ b/FreeRTOS/Source/include/timers.h
@@ -1256,7 +1256,7 @@ BaseType_t xTimerPendFunctionCallFromISR( PendedFunction_t xFunctionToPend, void
 BaseType_t xTimerPendFunctionCall( PendedFunction_t xFunctionToPend, void *pvParameter1, uint32_t ulParameter2, TickType_t xTicksToWait ) PRIVILEGED_FUNCTION;\r
 \r
 /**\r
- * const char * const pcTimerGetTimerName( TimerHandle_t xTimer );\r
+ * const char * const pcTimerGetName( TimerHandle_t xTimer );\r
  *\r
  * Returns the name that was assigned to a timer when the timer was created.\r
  *\r
@@ -1264,7 +1264,7 @@ BaseType_t xTimerPendFunctionCall( PendedFunction_t xFunctionToPend, void *pvPar
  *\r
  * @return The name assigned to the timer specified by the xTimer parameter.\r
  */\r
-const char * pcTimerGetTimerName( TimerHandle_t xTimer ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+const char * pcTimerGetName( TimerHandle_t xTimer ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
 \r
 /**\r
  * TickType_t xTimerGetPeriod( TimerHandle_t xTimer );\r

diff --git a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
index 783dad94aebdb0eedb23a2592e40f175ea97f2d1..ccbe24895544a78073632302375dcc0d8169d7f3 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
+++ b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
@@ -151,7 +151,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 = pcTaskGetName( NULL );\r
 \r
        configASSERT( pulStackPointerOnFunctionEntry );\r
 \r

diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c
index 5f35f55bcb7301ed0678df297f00278156d8f12d..cb4df754b70020f8fdca676709c92100df54f7f1 100644 (file)
--- a/FreeRTOS/Source/queue.c
+++ b/FreeRTOS/Source/queue.c
@@ -2283,7 +2283,7 @@ BaseType_t xReturn;
 \r
 #if ( configQUEUE_REGISTRY_SIZE > 0 )\r
 \r
-       const char *pcQueueGetQueueName( QueueHandle_t xQueue ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+       const char *pcQueueGetName( QueueHandle_t xQueue ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
        {\r
        UBaseType_t ux;\r
        const char *pcReturn = NULL; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r

diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c
index a93fedcdf01d8e5e01e5d52131c727fe1548493c..989f43a4349adb953c60ccf36d21635cf6e8e471 100644 (file)
--- a/FreeRTOS/Source/tasks.c
+++ b/FreeRTOS/Source/tasks.c
@@ -2063,20 +2063,16 @@ UBaseType_t uxTaskGetNumberOfTasks( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-#if ( INCLUDE_pcTaskGetTaskName == 1 )\r
-\r
-       char *pcTaskGetTaskName( TaskHandle_t xTaskToQuery ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
-       {\r
-       TCB_t *pxTCB;\r
-\r
-               /* If null is passed in here then the name of the calling task is being\r
-               queried. */\r
-               pxTCB = prvGetTCBFromHandle( xTaskToQuery );\r
-               configASSERT( pxTCB );\r
-               return &( pxTCB->pcTaskName[ 0 ] );\r
-       }\r
+char *pcTaskGetName( TaskHandle_t xTaskToQuery ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+{\r
+TCB_t *pxTCB;\r
 \r
-#endif /* INCLUDE_pcTaskGetTaskName */\r
+       /* If null is passed in here then the name of the calling task is being\r
+       queried. */\r
+       pxTCB = prvGetTCBFromHandle( xTaskToQuery );\r
+       configASSERT( pxTCB );\r
+       return &( pxTCB->pcTaskName[ 0 ] );\r
+}\r
 /*-----------------------------------------------------------*/\r
 \r
 #if ( INCLUDE_xTaskGetTaskHandle == 1 )\r

diff --git a/FreeRTOS/Source/timers.c b/FreeRTOS/Source/timers.c
index cd4df8a3d18d760d28853c020085bd6b3a870c43..5c0d4eb7e97eb4206af7a46712b8799c0372f1be 100644 (file)
--- a/FreeRTOS/Source/timers.c
+++ b/FreeRTOS/Source/timers.c
@@ -453,7 +453,7 @@ TickType_t xReturn;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-const char * pcTimerGetTimerName( TimerHandle_t xTimer ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+const char * pcTimerGetName( TimerHandle_t xTimer ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
 {\r
 Timer_t *pxTimer = ( Timer_t * ) xTimer;\r
 \r