Revert the CM0 port layer exception handler names to the traditional FreeRTOS names...

[freertos] / Source / timers.c

diff --git a/Source/timers.c b/Source/timers.c
index 2d3f3bad89e46be73d5fe9fb1298caaf6a3d7137..dd77d08108728bedf93804e1d3098b5326b0aa7d 100644 (file)
--- a/Source/timers.c
+++ b/Source/timers.c
@@ -1,12 +1,6 @@
 /*\r
-    FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
-       \r
+    FreeRTOS V7.1.0 - Copyright (C) 2011 Real Time Engineers Ltd.\r
 \r
-       FreeRTOS supports many tools and architectures. V7.0.0 is sponsored by:\r
-       Atollic AB - Atollic provides professional embedded systems development \r
-       tools for C/C++ development, code analysis and test automation.  \r
-       See http://www.atollic.com\r
-       \r
 \r
     ***************************************************************************\r
      *                                                                       *\r
@@ -110,7 +104,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_xTimerGetTimerDaemonTaskHandle == 1 )\r
        \r
        PRIVILEGED_DATA static xTaskHandle xTimerTaskHandle = NULL;\r
        \r
@@ -189,10 +183,10 @@ portBASE_TYPE xReturn = pdFAIL;
 \r
        if( xTimerQueue != NULL )\r
        {\r
-               #if ( INCLUDE_xTimerGetTimerTaskHandle == 1 )\r
+               #if ( INCLUDE_xTimerGetTimerDaemonTaskHandle == 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 xTimerGetTimerDaemonTaskHandle() 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
@@ -247,7 +241,7 @@ xTIMER *pxNewTimer;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xTimerGenericCommand( xTimerHandle xTimer, portBASE_TYPE xCommandID, portTickType xOptionalValue, portBASE_TYPE *pxHigherPriorityTaskWoken, portTickType xBlockTime )\r
+portBASE_TYPE xTimerGenericCommand( xTimerHandle xTimer, portBASE_TYPE xCommandID, portTickType xOptionalValue, signed portBASE_TYPE *pxHigherPriorityTaskWoken, portTickType xBlockTime )\r
 {\r
 portBASE_TYPE xReturn = pdFAIL;\r
 xTIMER_MESSAGE xMessage;\r
@@ -284,11 +278,11 @@ xTIMER_MESSAGE xMessage;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-#if ( INCLUDE_xTimerGetTimerTaskHandle == 1 )\r
+#if ( INCLUDE_xTimerGetTimerDaemonTaskHandle == 1 )\r
 \r
-       xTaskHandle xTimerGetTimerTaskHandle( void )\r
+       xTaskHandle xTimerGetTimerDaemonTaskHandle( void )\r
        {\r
-               /* If xTimerGetTimerTaskHandle() is called before the scheduler has been\r
+               /* If xTimerGetTimerDaemonTaskHandle() is called before the scheduler has been\r
                started, then xTimerTaskHandle will be NULL. */\r
                configASSERT( ( xTimerTaskHandle != NULL ) );\r
                return xTimerTaskHandle;\r