Update version number to 8.1.2 after moving the defaulting of configUSE_PORT_OPTIMISE...

[freertos] / FreeRTOS / Demo / CORTEX_M0+_Atmel_SAMD20_XPlained / RTOSDemo / src / main-full.c

diff --git a/FreeRTOS/Demo/CORTEX_M0+_Atmel_SAMD20_XPlained/RTOSDemo/src/main-full.c b/FreeRTOS/Demo/CORTEX_M0+_Atmel_SAMD20_XPlained/RTOSDemo/src/main-full.c
index ca25a494acea538781b51f7eac4892656286c9f6..de486132908043b7b3dfaed6905d1a67791c45ce 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M0+_Atmel_SAMD20_XPlained/RTOSDemo/src/main-full.c
+++ b/FreeRTOS/Demo/CORTEX_M0+_Atmel_SAMD20_XPlained/RTOSDemo/src/main-full.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd. \r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -24,10 +24,10 @@
     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
 \r
-    >>! NOTE: The modification to the GPL is included to allow you to distribute\r
-    >>! a combined work that includes FreeRTOS without being obliged to provide\r
-    >>! the source code for proprietary components outside of the FreeRTOS\r
-    >>! kernel.\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
@@ -135,13 +135,13 @@
 \r
 /* The period after which the check timer will expire provided no errors have\r
 been reported by any of the standard demo tasks.  ms are converted to the\r
-equivalent in ticks using the portTICK_RATE_MS constant. */\r
-#define mainCHECK_TIMER_PERIOD_MS                      ( 3000UL / portTICK_RATE_MS )\r
+equivalent in ticks using the portTICK_PERIOD_MS constant. */\r
+#define mainCHECK_TIMER_PERIOD_MS                      ( 3000UL / portTICK_PERIOD_MS )\r
 \r
 /* The period at which the check timer will expire if an error has been\r
 reported in one of the standard demo tasks.  ms are converted to the equivalent\r
-in ticks using the portTICK_RATE_MS constant. */\r
-#define mainERROR_CHECK_TIMER_PERIOD_MS        ( 200UL / portTICK_RATE_MS )\r
+in ticks using the portTICK_PERIOD_MS constant. */\r
+#define mainERROR_CHECK_TIMER_PERIOD_MS        ( 200UL / portTICK_PERIOD_MS )\r
 \r
 /* A block time of zero simply means "don't block". */\r
 #define mainDONT_BLOCK                                         ( 0UL )\r
@@ -164,7 +164,7 @@ extern void vUARTCommandConsoleStart( uint16_t usStackSize, unsigned portBASE_TY
 /*\r
  * The check timer callback function, as described at the top of this file.\r
  */\r
-static void prvCheckTimerCallback( xTimerHandle xTimer );\r
+static void prvCheckTimerCallback( TimerHandle_t xTimer );\r
 \r
 /*\r
  * Called by main() to create the comprehensive test/demo application if\r
@@ -184,7 +184,7 @@ volatile unsigned long ulRegTest1LoopCounter = 0UL, ulRegTest2LoopCounter = 0UL;
 \r
 void main_full( void )\r
 {\r
-xTimerHandle xTimer = NULL;\r
+TimerHandle_t xTimer = NULL;\r
 \r
 /* The register test tasks are asm functions that don't use a stack.  The\r
 stack allocated just has to be large enough to hold the task context, and\r
@@ -209,14 +209,14 @@ const size_t xRegTestStackSize = 25U;
        These are naked functions that don't use any stack.  A stack still has\r
        to be allocated to hold the task context. */\r
        xTaskCreate(    vRegTest1Task,                  /* Function that implements the task. */\r
-                                       ( signed char * ) "Reg1", /* Text name of the task. */\r
+                                       "Reg1",                                 /* Text name of the task. */\r
                                        xRegTestStackSize,              /* Stack allocated to the task. */\r
                                        NULL,                                   /* The task parameter is not used. */\r
                                        tskIDLE_PRIORITY,               /* The priority to assign to the task. */\r
                                        NULL );                                 /* Don't receive a handle back, it is not needed. */\r
 \r
        xTaskCreate(    vRegTest2Task,                  /* Function that implements the task. */\r
-                                       ( signed char * ) "Reg2", /* Text name of the task. */\r
+                                       "Reg2",                                 /* Text name of the task. */\r
                                        xRegTestStackSize,              /* Stack allocated to the task. */\r
                                        NULL,                                   /* The task parameter is not used. */\r
                                        tskIDLE_PRIORITY,               /* The priority to assign to the task. */\r
@@ -224,7 +224,7 @@ const size_t xRegTestStackSize = 25U;
 \r
        /* Create the software timer that performs the 'check' functionality,\r
        as described at the top of this file. */\r
-       xTimer = xTimerCreate(  ( const signed char * ) "CheckTimer",/* A text name, purely to help debugging. */\r
+       xTimer = xTimerCreate(  "CheckTimer",                                           /* A text name, purely to help debugging. */\r
                                                        ( mainCHECK_TIMER_PERIOD_MS ),          /* The timer period, in this case 3000ms (3s). */\r
                                                        pdTRUE,                                                         /* This is an auto-reload timer, so xAutoReload is set to pdTRUE. */\r
                                                        ( void * ) 0,                                           /* The ID is not used, so can be set to anything. */\r
@@ -254,7 +254,7 @@ const size_t xRegTestStackSize = 25U;
 /*-----------------------------------------------------------*/\r
 \r
 /* See the description at the top of this file. */\r
-static void prvCheckTimerCallback( xTimerHandle xTimer )\r
+static void prvCheckTimerCallback( TimerHandle_t xTimer )\r
 {\r
 static long lChangedTimerPeriodAlready = pdFALSE;\r
 static unsigned long ulLastRegTest1Value = 0, ulLastRegTest2Value = 0;\r