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

[freertos] / FreeRTOS / Demo / CORTEX_M4_ATSAM4S_Atmel_Studio / src / Common-Demo-Source / comtest.c

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/comtest.c b/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/comtest.c
index d611d7cd4cf1d4c77bb535ddf4a4ce29470188b3..f4a1483e38c449682551418543ca764a788f166b 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/comtest.c
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/comtest.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
@@ -112,16 +112,16 @@
 \r
 /* The Tx task will transmit the sequence of characters at a pseudo random\r
 interval.  This is the maximum and minimum block time between sends. */\r
-#define comTX_MAX_BLOCK_TIME           ( ( portTickType ) 0x96 )\r
-#define comTX_MIN_BLOCK_TIME           ( ( portTickType ) 0x32 )\r
-#define comOFFSET_TIME                         ( ( portTickType ) 3 )\r
+#define comTX_MAX_BLOCK_TIME           ( ( TickType_t ) 0x96 )\r
+#define comTX_MIN_BLOCK_TIME           ( ( TickType_t ) 0x32 )\r
+#define comOFFSET_TIME                         ( ( TickType_t ) 3 )\r
 \r
 /* We should find that each character can be queued for Tx immediately and we\r
 don't have to block to send. */\r
-#define comNO_BLOCK                                    ( ( portTickType ) 0 )\r
+#define comNO_BLOCK                                    ( ( TickType_t ) 0 )\r
 \r
 /* The Rx task will block on the Rx queue for a long period. */\r
-#define comRX_BLOCK_TIME                       ( ( portTickType ) 0xffff )\r
+#define comRX_BLOCK_TIME                       ( ( TickType_t ) 0xffff )\r
 \r
 /* The sequence transmitted is from comFIRST_BYTE to and including comLAST_BYTE. */\r
 #define comFIRST_BYTE                          ( 'A' )\r
@@ -158,15 +158,15 @@ void vAltStartComTestTasks( unsigned portBASE_TYPE uxPriority, unsigned long ulB
        xSerialPortInitMinimal( ulBaudRate, comBUFFER_LEN );\r
 \r
        /* The Tx task is spawned with a lower priority than the Rx task. */\r
-       xTaskCreate( vComTxTask, "COMTx", comSTACK_SIZE, NULL, uxPriority - 1, ( xTaskHandle * ) NULL );\r
-       xTaskCreate( vComRxTask, "COMRx", comSTACK_SIZE, NULL, uxPriority, ( xTaskHandle * ) NULL );\r
+       xTaskCreate( vComTxTask, "COMTx", comSTACK_SIZE, NULL, uxPriority - 1, ( TaskHandle_t * ) NULL );\r
+       xTaskCreate( vComRxTask, "COMRx", comSTACK_SIZE, NULL, uxPriority, ( TaskHandle_t * ) NULL );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 static portTASK_FUNCTION( vComTxTask, pvParameters )\r
 {\r
 signed char cByteToSend;\r
-portTickType xTimeToWait;\r
+TickType_t xTimeToWait;\r
 \r
        /* Just to stop compiler warnings. */\r
        ( void ) pvParameters;\r