Commit before update to include overflow list functionality.

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

diff --git a/Source/timers.c b/Source/timers.c
index a0b9b349de8ff327c60492848d21e3a3d7a5ef0a..6b2e602358923ab70c0fd28af80af076f1af6802 100644 (file)
--- a/Source/timers.c
+++ b/Source/timers.c
@@ -79,7 +79,7 @@ typedef struct tmrTimerControl
        tmrTIMER_CALLBACK               pxCallbackFunction;     /*<< The function that will be called when the timer expires. */\r
 } xTIMER;\r
 \r
-/* The definition of messages that can be sent and received on the timer \r
+/* The definition of messages that can be sent and received on the timer\r
 queue. */\r
 typedef struct tmrTimerQueueMessage\r
 {\r
@@ -99,7 +99,7 @@ PRIVILEGED_DATA static xQueueHandle xTimerQueue = NULL;
 \r
 /*-----------------------------------------------------------*/\r
 \r
-/* \r
+/*\r
  * Initialise the infrustructure used by the timer service task if it has not\r
  * been initialised already.\r
  */\r
@@ -107,20 +107,14 @@ static void prvCheckForValidListAndQueue( void ) PRIVILEGED_FUNCTION;
 \r
 /*\r
  * The timer service task (daemon).  Timer functionality is controlled by this\r
- * task.  Other tasks communicate with the timer service task using the \r
+ * task.  Other tasks communicate with the timer service task using the\r
  * xTimerQueue queue.\r
  */\r
 static void prvTimerTask( void *pvParameters ) PRIVILEGED_FUNCTION;\r
 \r
-/* \r
- * The following functions handle the commands that are sent to the timer\r
- * service task via the xTimerQueue queue.\r
- */\r
-static void prvTimerStart( xTIMER *pxTimer ) PRIVILEGED_FUNCTION;\r
-\r
 /*\r
  * Called by the timer service task to interpret and process a command it\r
- * received on the timer queue. \r
+ * received on the timer queue.\r
  */\r
 static void    prvProcessReceivedCommands( void ) PRIVILEGED_FUNCTION;\r
 \r
@@ -130,7 +124,7 @@ portBASE_TYPE xTimerCreateTimerTask( void )
 {\r
 portBASE_TYPE xReturn = pdFAIL;\r
 \r
-       /* This function is called when the scheduler is started if \r
+       /* This function is called when the scheduler is started if\r
        configUSE_TIMERS is set to 1.  Check that the infrustructure used by the\r
        timer service task has been created/initialised.  If timers have already\r
        been created then the initialisation will already have been performed. */\r
@@ -138,7 +132,7 @@ portBASE_TYPE xReturn = pdFAIL;
 \r
        if( xTimerQueue != NULL )\r
        {\r
-               xReturn = xTaskCreate( prvTimerTask, ( const signed char * ) "Timers", configTIMER_TASK_STACK_DEPTH, NULL, configTIMER_TASK_PRIORITY, NULL );\r
+               xReturn = xTaskCreate( prvTimerTask, ( const signed char * ) "Timer Service", configTIMER_TASK_STACK_DEPTH, NULL, configTIMER_TASK_PRIORITY, NULL );\r
        }\r
 \r
        return xReturn;\r
@@ -249,15 +243,15 @@ xTIMER *pxTimer;
                                xTimeNow = xTaskGetTickCount();\r
                                if( xTimeNow < xNextExpireTime )\r
                                {\r
-                                       /* This is a simple fast function - a yield will not be \r
+                                       /* This is a simple fast function - a yield will not be\r
                                        performed until after this critical section exits. */\r
                                        vQueueWaitForMessageRestricted( xTimerQueue, ( xNextExpireTime - xTimeNow ) );\r
                                }\r
                        }\r
                        taskEXIT_CRITICAL();\r
 \r
-                       /* Yield to wait for either a command to arrive, or the block time \r
-                       to expire.  If a command arrived between the critical section being \r
+                       /* Yield to wait for either a command to arrive, or the block time\r
+                       to expire.  If a command arrived between the critical section being\r
                        exited and this yeild then the yield will just return to the same\r
                        task. */\r
                        portYIELD_WITHIN_API();\r
@@ -326,7 +320,7 @@ xTIMER *pxTimer;
 static void prvCheckForValidListAndQueue( void )\r
 {\r
        /* Check that the list from which active timers are referenced, and the\r
-       queue used to communicate with the timer service, have been \r
+       queue used to communicate with the timer service, have been\r
        initialised. */\r
        taskENTER_CRITICAL();\r
        {\r