Check in the portable.h version required to use heap_5.c.

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

diff --git a/FreeRTOS/Demo/CORTEX_LM3S811_KEIL/main.c b/FreeRTOS/Demo/CORTEX_LM3S811_KEIL/main.c
index bb1a4f09cb057766d4d0a2e62b66aeba075505e0..65d41641c8c3048677ddb9db5e659cf258eadd05 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_LM3S811_KEIL/main.c
+++ b/FreeRTOS/Demo/CORTEX_LM3S811_KEIL/main.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.1 - 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
@@ -118,7 +119,7 @@
 #include "BlockQ.h"\r
 \r
 /* Delay 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
 /* UART configuration - note this does not use the FIFO so is not very \r
 efficient. */\r
@@ -136,8 +137,8 @@ efficient. */
 \r
 /* Misc. */\r
 #define mainQUEUE_SIZE                         ( 3 )\r
-#define mainDEBOUNCE_DELAY                     ( ( portTickType ) 150 / portTICK_RATE_MS )\r
-#define mainNO_DELAY                           ( ( portTickType ) 0 )\r
+#define mainDEBOUNCE_DELAY                     ( ( TickType_t ) 150 / portTICK_PERIOD_MS )\r
+#define mainNO_DELAY                           ( ( TickType_t ) 0 )\r
 /*\r
  * Configure the processor and peripherals for this demo. \r
  */\r
@@ -165,10 +166,10 @@ static volatile char *pcNextChar;
 \r
 /* The semaphore used to wake the button handler task from within the GPIO\r
 interrupt handler. */\r
-xSemaphoreHandle xButtonSemaphore;\r
+SemaphoreHandle_t xButtonSemaphore;\r
 \r
 /* The queue used to send strings to the print task for display on the LCD. */\r
-xQueueHandle xPrintQueue;\r
+QueueHandle_t xPrintQueue;\r
 \r
 /* Newer library version. */\r
 extern void UARTConfigSetExpClk(unsigned long ulBase, unsigned long ulUARTClk, unsigned long ulBaud, unsigned long ulConfig);\r
@@ -211,7 +212,7 @@ int main( void )
 static void vCheckTask( void *pvParameters )\r
 {\r
 portBASE_TYPE xErrorOccurred = pdFALSE;\r
-portTickType xLastExecutionTime;\r
+TickType_t xLastExecutionTime;\r
 const char *pcPassMessage = "PASS";\r
 const char *pcFailMessage = "FAIL";\r
 \r