Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Demo / Common / Minimal / TimerDemo.c

diff --git a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
index de37052b20ed6c2ac8fd147e2f051663cb61e1b5..ec4996dea7d8952cc09cf67d55e32d5e9855661a 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
+++ b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.2.1 - Copyright (C) 2015 Real Time Engineers Ltd.\r
+    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -8,7 +8,7 @@
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r
 \r
     ***************************************************************************\r
     >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
@@ -192,7 +192,7 @@ static void prvTimerTestTask( void *pvParameters )
        xOneShotTimer = xTimerCreate(   "Oneshot Timer",                                /* Text name to facilitate debugging.  The kernel does not use this itself. */\r
                                                                        tmrdemoONE_SHOT_TIMER_PERIOD,   /* The period for the timer. */\r
                                                                        pdFALSE,                                                /* Don't auto-reload - hence a one shot timer. */\r
-                                                                       ( void * ) 0,                                   /* The timer identifier.  In this case this is not used as the timer has its own callback. */\r
+                                                                       ( void * ) 0,                                   /* The timer identifier.  Initialise to 0, then increment each time it is called. */\r
                                                                        prvOneShotTimerCallback );              /* The callback to be called when the timer expires. */\r
 \r
        if( xOneShotTimer == NULL )\r
@@ -285,18 +285,16 @@ TickType_t xTimer;
 \r
        for( xTimer = 0; xTimer < configTIMER_QUEUE_LENGTH; xTimer++ )\r
        {\r
-               /* As the timer queue is not yet full, it should be possible to both create\r
-               and start a timer.  These timers are being started before the scheduler has\r
-               been started, so their block times should get set to zero within the timer\r
-               API itself. */\r
+               /* As the timer queue is not yet full, it should be possible to both\r
+               create and start a timer.  These timers are being started before the\r
+               scheduler has been started, so their block times should get set to zero\r
+               within the timer API itself. */\r
                xAutoReloadTimers[ xTimer ] = xTimerCreate( "FR Timer",                                                 /* Text name to facilitate debugging.  The kernel does not use this itself. */\r
                                                                                                        ( ( xTimer + ( TickType_t ) 1 ) * xBasePeriod ),/* The period for the timer.  The plus 1 ensures a period of zero is not specified. */\r
                                                                                                        pdTRUE,                                                         /* Auto-reload is set to true. */\r
                                                                                                        ( 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
@@ -304,6 +302,8 @@ TickType_t xTimer;
                }\r
                else\r
                {\r
+                       configASSERT( strcmp( pcTimerGetName( xAutoReloadTimers[ xTimer ] ), "FR Timer" ) == 0 );\r
+\r
                        /* The scheduler has not yet started, so the block period of\r
                        portMAX_DELAY should just get set to zero in xTimerStart().  Also,\r
                        the timer queue is not yet full so xTimerStart() should return\r
@@ -402,7 +402,7 @@ UBaseType_t uxOriginalPriority;
        in the Blocked state. */\r
        uxOriginalPriority = uxTaskPriorityGet( NULL );\r
        vTaskPrioritySet( NULL, ( configMAX_PRIORITIES - 1 ) );\r
-       \r
+\r
        /* Delaying for configTIMER_QUEUE_LENGTH * xBasePeriod ticks should allow\r
        all the auto reload timers to expire at least once. */\r
        xBlockPeriod = ( ( TickType_t ) configTIMER_QUEUE_LENGTH ) * xBasePeriod;\r
@@ -1044,12 +1044,12 @@ static TickType_t uxTick = ( TickType_t ) -1;
 \r
 static void prvAutoReloadTimerCallback( TimerHandle_t pxExpiredTimer )\r
 {\r
-uint32_t ulTimerID;\r
+size_t uxTimerID;\r
 \r
-       ulTimerID = ( uint32_t ) pvTimerGetTimerID( pxExpiredTimer );\r
-       if( ulTimerID <= ( configTIMER_QUEUE_LENGTH + 1 ) )\r
+       uxTimerID = ( size_t ) pvTimerGetTimerID( pxExpiredTimer );\r
+       if( uxTimerID <= ( configTIMER_QUEUE_LENGTH + 1 ) )\r
        {\r
-               ( ucAutoReloadTimerCounters[ ulTimerID ] )++;\r
+               ( ucAutoReloadTimerCounters[ uxTimerID ] )++;\r
        }\r
        else\r
        {\r
@@ -1062,9 +1062,22 @@ uint32_t ulTimerID;
 \r
 static void prvOneShotTimerCallback( TimerHandle_t pxExpiredTimer )\r
 {\r
-       /* The parameter is not used in this case as only one timer uses this\r
-       callback function. */\r
-       ( void ) pxExpiredTimer;\r
+/* A count is kept of the number of times this callback function is executed.\r
+The count is stored as the timer's ID.  This is only done to test the\r
+vTimerSetTimerID() function. */\r
+static size_t uxCallCount = 0;\r
+size_t uxLastCallCount;\r
+\r
+       /* Obtain the timer's ID, which should be a count of the number of times\r
+       this callback function has been executed. */\r
+       uxLastCallCount = ( size_t ) pvTimerGetTimerID( pxExpiredTimer );\r
+       configASSERT( uxLastCallCount == uxCallCount );\r
+\r
+       /* Increment the call count, then save it back as the timer's ID.  This is\r
+       only done to test the vTimerSetTimerID() API function. */\r
+       uxLastCallCount++;\r
+       vTimerSetTimerID( pxExpiredTimer, ( void * ) uxLastCallCount );\r
+       uxCallCount++;\r
 \r
        ucOneShotTimerCounter++;\r
 }\r