Update version number ready for release.

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

diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/main.c b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/main.c
index dfc2175a2ac123488f7668d63dde9c351f9dd8b0..ba860efabe869474cf6e95ad4c5322a547598a02 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/main.c
+++ b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/main.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - 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
@@ -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
@@ -147,10 +147,10 @@ time. */
 #define mainMAX_MSG_LEN                                                25\r
 \r
 /* The time between cycles of the 'check' task. */\r
-#define mainCHECK_DELAY                                                ( ( portTickType ) 5000 / portTICK_RATE_MS )\r
+#define mainCHECK_DELAY                                                ( ( TickType_t ) 5000 / portTICK_PERIOD_MS )\r
 \r
 /* The number of nano seconds between each processor clock. */\r
-#define mainNS_PER_CLOCK ( ( unsigned portLONG ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) )\r
+#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) )\r
 \r
 /* Baud rate used by the comtest tasks. */\r
 #define mainCOM_TEST_BAUD_RATE         ( 115200 )\r
@@ -205,7 +205,7 @@ extern void vSetupTimerTest( void );
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used to send messages to the LCD task. */\r
-xQueueHandle xLCDQueue;\r
+QueueHandle_t xLCDQueue;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -257,7 +257,7 @@ xLCDMessage xMessage;
 \r
        /* Initialise the LCD and display a startup message. */\r
        prvConfigureLCD();\r
-       LCD_DrawMonoPict( ( unsigned portLONG * ) pcBitmap );\r
+       LCD_DrawMonoPict( ( unsigned long * ) pcBitmap );\r
 \r
        for( ;; )\r
        {\r
@@ -265,17 +265,17 @@ xLCDMessage xMessage;
                while( xQueueReceive( xLCDQueue, &xMessage, portMAX_DELAY ) != pdPASS );\r
 \r
                /* Display the message.  Print each message to a different position. */\r
-               printf( ( portCHAR const * ) xMessage.pcMessage );\r
+               printf( ( char const * ) xMessage.pcMessage );\r
        }\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 static void vCheckTask( void *pvParameters )\r
 {\r
-portTickType xLastExecutionTime;\r
+TickType_t xLastExecutionTime;\r
 xLCDMessage xMessage;\r
-static signed portCHAR cPassMessage[ mainMAX_MSG_LEN ];\r
-extern unsigned portSHORT usMaxJitter;\r
+static signed char cPassMessage[ mainMAX_MSG_LEN ];\r
+extern unsigned short usMaxJitter;\r
 \r
        xLastExecutionTime = xTaskGetTickCount();\r
        xMessage.pcMessage = cPassMessage;\r
@@ -317,7 +317,7 @@ extern unsigned portSHORT usMaxJitter;
                }\r
                else\r
                {\r
-                       sprintf( ( portCHAR * ) cPassMessage, "PASS [%uns]\n", ( ( unsigned portLONG ) usMaxJitter ) * mainNS_PER_CLOCK );\r
+                       sprintf( ( char * ) cPassMessage, "PASS [%uns]\n", ( ( unsigned long ) usMaxJitter ) * mainNS_PER_CLOCK );\r
                }\r
 \r
                /* Send the message to the LCD gatekeeper for display. */\r
@@ -340,7 +340,7 @@ static void prvSetupHardware( void )
        }\r
 \r
        /* 2 wait states required on the flash. */\r
-       *( ( unsigned portLONG * ) 0x40022000 ) = 0x02;\r
+       *( ( unsigned long * ) 0x40022000 ) = 0x02;\r
 \r
        /* HCLK = SYSCLK */\r
        RCC_HCLKConfig( RCC_SYSCLK_Div1 );\r
@@ -418,8 +418,8 @@ GPIO_InitTypeDef GPIO_InitStructure;
 \r
 int fputc( int ch, FILE *f )\r
 {\r
-static unsigned portSHORT usColumn = 0, usRefColumn = mainCOLUMN_START;\r
-static unsigned portCHAR ucLine = 0;\r
+static unsigned short usColumn = 0, usRefColumn = mainCOLUMN_START;\r
+static unsigned char ucLine = 0;\r
 \r
        if( ( usColumn == 0 ) && ( ucLine == 0 ) )\r
        {\r
@@ -463,7 +463,7 @@ static unsigned portCHAR ucLine = 0;
 \r
 #ifdef  DEBUG\r
 /* Keep the linker happy. */\r
-void assert_failed( unsigned portCHAR* pcFile, unsigned portLONG ulLine )\r
+void assert_failed( unsigned char* pcFile, unsigned long ulLine )\r
 {\r
        for( ;; )\r
        {\r