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

[freertos] / FreeRTOS / Demo / NEC_78K0R_IAR / main.c

diff --git a/FreeRTOS/Demo/NEC_78K0R_IAR/main.c b/FreeRTOS/Demo/NEC_78K0R_IAR/main.c
index ed8ccc76049abf17bcff5fcb301ca94e385f6545..c46a45788ef24c9395b5b3329fe50d96b024b4b1 100644 (file)
--- a/FreeRTOS/Demo/NEC_78K0R_IAR/main.c
+++ b/FreeRTOS/Demo/NEC_78K0R_IAR/main.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.1 - 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
 \r
@@ -23,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
@@ -116,8 +117,8 @@
 #define mainGEN_QUEUE_PRIORITY ( tskIDLE_PRIORITY )\r
 \r
 /* The period between executions of the check task. */\r
-#define mainNO_ERROR_TOGGLE_PERIOD     ( ( portTickType ) 3000 / portTICK_RATE_MS  )\r
-#define mainERROR_TOGGLE_PERIOD                ( ( portTickType ) 500 / portTICK_RATE_MS  )\r
+#define mainNO_ERROR_TOGGLE_PERIOD     ( ( TickType_t ) 3000 / portTICK_PERIOD_MS  )\r
+#define mainERROR_TOGGLE_PERIOD                ( ( TickType_t ) 500 / portTICK_PERIOD_MS  )\r
 \r
 /* The LED toggled by the check task. */\r
 #define mainLED_0   P7_bit.no6\r
@@ -162,13 +163,13 @@ static short sRegTestStatus = pdPASS;
 \r
 /* 78K0R Option Byte Definition. Watchdog disabled, LVI enabled, OCD interface\r
 enabled. */\r
-__root __far const unsigned portCHAR OptionByte[] @ 0x00C0 =\r
+__root __far const unsigned char OptionByte[] @ 0x00C0 =\r
 {\r
        WATCHDOG_DISABLED, LVI_ENABLED, RESERVED_FF, OCD_ENABLED\r
 };\r
 \r
 /* Security byte definition */\r
-__root __far const unsigned portCHAR SecuIDCode[]  @ 0x00C4 =\r
+__root __far const unsigned char SecuIDCode[]  @ 0x00C4 =\r
 {\r
        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff\r
 };\r
@@ -216,7 +217,7 @@ short main( void )
 \r
 static void vErrorChecks( void *pvParameters )\r
 {\r
-portTickType xToggleRate = mainNO_ERROR_TOGGLE_PERIOD, xLastWakeTime;\r
+TickType_t xToggleRate = mainNO_ERROR_TOGGLE_PERIOD, xLastWakeTime;\r
 \r
        /* Ensure the parameter was passed in as expected.  This is just a test of\r
        the kernel port, the parameter is not actually used for anything.  The\r
@@ -282,7 +283,7 @@ portTickType xToggleRate = mainNO_ERROR_TOGGLE_PERIOD, xLastWakeTime;
 \r
 int __low_level_init(void)\r
 {\r
-unsigned portCHAR ucResetFlag = RESF;\r
+unsigned char ucResetFlag = RESF;\r
 \r
        portDISABLE_INTERRUPTS();\r
 \r
@@ -309,7 +310,7 @@ unsigned portCHAR ucResetFlag = RESF;
 \r
                /* Set clock speed. */\r
                CSS = 0;\r
-               CKC &= (unsigned portCHAR)~0x07;\r
+               CKC &= (unsigned char)~0x07;\r
                CKC |= 0x00;\r
        }\r
        #else\r