Add the pcTimerGetTimerName() API function.

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

diff --git a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
index fc0d1639e24a5fb2321c606ed50dade95b6fcf8f..d14fc078518df38a34f6f426e25a1f53dd3b3451 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
+++ b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
@@ -291,6 +291,8 @@ unsigned portBASE_TYPE xTimer;
                                                                                                        ( void * ) xTimer,                                      /* An identifier for the timer as all the auto reload timers use the same callback. */\r
                                                                                                        prvAutoReloadTimerCallback );           /* The callback to be called when the timer expires. */\r
 \r
+               configASSERT( strcmp( pcTimerGetTimerName( xAutoReloadTimers[ xTimer ] ), "FR Timer" ) == 0 );\r
+\r
                if( xAutoReloadTimers[ xTimer ] == NULL )\r
                {\r
                        xTestStatus = pdFAIL;\r

diff --git a/FreeRTOS/Demo/Common/Minimal/death.c b/FreeRTOS/Demo/Common/Minimal/death.c
index c93519fa60feaf84f7b6e78307269edb6b14f0ba..f127e04c74bad14a13d3952cc20b4f8261d67256 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/death.c
+++ b/FreeRTOS/Demo/Common/Minimal/death.c
@@ -82,19 +82,6 @@
  * <HR>\r
  */\r
 \r
-/*\r
-Changes from V3.0.0\r
-       + CreationCount sizes changed from unsigned portBASE_TYPE to\r
-         unsigned short to minimize the risk of overflowing.\r
-       \r
-       + Reset of usLastCreationCount added\r
-       \r
-Changes from V3.1.0\r
-       + Changed the dummy calculation to use variables of type long, rather than\r
-         float.  This allows the file to be used with ports that do not support\r
-         floating point.\r
-\r
-*/\r
 \r
 #include <stdlib.h>\r
 \r

diff --git a/FreeRTOS/Source/include/timers.h b/FreeRTOS/Source/include/timers.h
index 46d6eb1608c744ccfda2caa86d01401dbf472f11..5cd1f350320c0bc2c2fb2e7959acbf898addde76 100644 (file)
--- a/FreeRTOS/Source/include/timers.h
+++ b/FreeRTOS/Source/include/timers.h
@@ -1094,6 +1094,17 @@ BaseType_t xTimerPendFunctionCallFromISR( PendedFunction_t xFunctionToPend, void
   */\r
 BaseType_t xTimerPendFunctionCall( PendedFunction_t xFunctionToPend, void *pvParameter1, uint32_t ulParameter2, TickType_t xTicksToWait );\r
 \r
+/**\r
+ * const char * const pcTimerGetTimerName( TimerHandle_t xTimer );\r
+ *\r
+ * Returns the name that was asigned to a timer when the timer was created.\r
+ *\r
+ * @param xTimer The handle of the timer being queried.\r
+ *\r
+ * @return The name asigned to the timer specified by the xTimer parameter.\r
+ */\r
+const char * const pcTimerGetTimerName( TimerHandle_t xTimer );\r
+\r
 /*\r
  * Functions beyond this part are not part of the public API and are intended\r
  * for use by the kernel only.\r

diff --git a/FreeRTOS/Source/timers.c b/FreeRTOS/Source/timers.c
index 4ec998ff9cabe4fff32b03131607c59fa51d46b1..d7d4295549f28cde471db766338f363abd5b9837 100644 (file)
--- a/FreeRTOS/Source/timers.c
+++ b/FreeRTOS/Source/timers.c
@@ -363,6 +363,14 @@ DaemonTaskMessage_t xMessage;
 #endif\r
 /*-----------------------------------------------------------*/\r
 \r
+const char * const pcTimerGetTimerName( TimerHandle_t xTimer )\r
+{\r
+Timer_t *pxTimer = ( Timer_t * ) xTimer;\r
+\r
+       return pxTimer->pcTimerName;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
 static void prvProcessExpiredTimer( const TickType_t xNextExpireTime, const TickType_t xTimeNow )\r
 {\r
 BaseType_t xResult;\r