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 46b8c03a4ec52dff9271193493a67622aa3c9ca9..ec4996dea7d8952cc09cf67d55e32d5e9855661a 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
+++ b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 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
@@ -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