Update version number ready for release.

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

diff --git a/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/main.c b/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/main.c
index 12d2843d0a6ff9270b3335d363fe662818a61fac..2f4a614afd7dc954e5e39b7ba842c2ecf653f113 100644 (file)
--- a/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/main.c
+++ b/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/main.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.2 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.0.1 - 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
@@ -109,13 +110,13 @@
 /*-----------------------------------------------------------*/\r
 \r
 /* Constants to setup I/O and processor. */\r
-#define mainTX_ENABLE          ( ( unsigned portLONG ) 0x00010000 )    /* UART1. */\r
-#define mainRX_ENABLE          ( ( unsigned portLONG ) 0x00040000 )    /* UART1. */\r
-#define mainBUS_CLK_FULL       ( ( unsigned portCHAR ) 0x01 )\r
-#define mainLED_TO_OUTPUT      ( ( unsigned portLONG ) 0xff0000 )\r
+#define mainTX_ENABLE          ( ( unsigned long ) 0x00010000 )        /* UART1. */\r
+#define mainRX_ENABLE          ( ( unsigned long ) 0x00040000 )        /* UART1. */\r
+#define mainBUS_CLK_FULL       ( ( unsigned char ) 0x01 )\r
+#define mainLED_TO_OUTPUT      ( ( unsigned long ) 0xff0000 )\r
 \r
 /* Constants for the ComTest demo application tasks. */\r
-#define mainCOM_TEST_BAUD_RATE ( ( unsigned portLONG ) 115200 )\r
+#define mainCOM_TEST_BAUD_RATE ( ( unsigned long ) 115200 )\r
 #define mainCOM_TEST_LED               ( 3 )\r
 \r
 /* Priorities for the demo application tasks. */\r
@@ -132,8 +133,8 @@ indicate whether an error has been detected or not.  If the LED toggles every
 3 seconds then no errors have been detected.  If the rate increases to 500ms\r
 then an error has been detected in at least one of the demo application tasks. */\r
 #define mainCHECK_LED                          ( 7 )\r
-#define mainNO_ERROR_FLASH_PERIOD      ( ( portTickType ) 3000 / portTICK_RATE_MS  )\r
-#define mainERROR_FLASH_PERIOD         ( ( portTickType ) 500 / portTICK_RATE_MS  )\r
+#define mainNO_ERROR_FLASH_PERIOD      ( ( TickType_t ) 3000 / portTICK_PERIOD_MS  )\r
+#define mainERROR_FLASH_PERIOD         ( ( TickType_t ) 500 / portTICK_PERIOD_MS  )\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -141,7 +142,7 @@ then an error has been detected in at least one of the demo application tasks. *
  * Checks that all the demo application tasks are still executing without error\r
  * - as described at the top of the file.\r
  */\r
-static portLONG prvCheckOtherTasksAreStillRunning( void );\r
+static long prvCheckOtherTasksAreStillRunning( void );\r
 \r
 /*\r
  * The task that executes at the highest priority and calls \r
@@ -200,7 +201,7 @@ int main( void )
 \r
 static void vErrorChecks( void *pvParameters )\r
 {\r
-portTickType xDelayPeriod = mainNO_ERROR_FLASH_PERIOD;\r
+TickType_t xDelayPeriod = mainNO_ERROR_FLASH_PERIOD;\r
 \r
        /* Parameters are not used. */\r
        ( void ) pvParameters;\r
@@ -248,9 +249,9 @@ static void prvSetupHardware( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static portLONG prvCheckOtherTasksAreStillRunning( void )\r
+static long prvCheckOtherTasksAreStillRunning( void )\r
 {\r
-portLONG lReturn = pdPASS;\r
+long lReturn = pdPASS;\r
 \r
        /* Check all the demo tasks (other than the flash tasks) to ensure\r
        that they are all still running, and that none of them have detected\r