Ensure demo app files are using FreeRTOS V8 names - a few were missed previously.

[freertos] / FreeRTOS / Demo / Common / Minimal / comtest.c

diff --git a/FreeRTOS/Demo/Common/Minimal/comtest.c b/FreeRTOS/Demo/Common/Minimal/comtest.c
index 6da8f2cbf32802e64c601ef6e0807ba287892459..ea9d06ea39e3726012f2b6f1ced982cd9848c555 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/comtest.c
+++ b/FreeRTOS/Demo/Common/Minimal/comtest.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 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
@@ -127,7 +127,7 @@ don't have to block to send. */
 #define comFIRST_BYTE                          ( 'A' )\r
 #define comLAST_BYTE                           ( 'X' )\r
 \r
-#define comBUFFER_LEN                          ( ( unsigned portBASE_TYPE ) ( comLAST_BYTE - comFIRST_BYTE ) + ( unsigned portBASE_TYPE ) 1 )\r
+#define comBUFFER_LEN                          ( ( UBaseType_t ) ( comLAST_BYTE - comFIRST_BYTE ) + ( UBaseType_t ) 1 )\r
 #define comINITIAL_RX_COUNT_VALUE      ( 0 )\r
 \r
 /* Handle to the com port used by both tasks. */\r
@@ -142,16 +142,16 @@ static portTASK_FUNCTION_PROTO( vComRxTask, pvParameters );
 /* The LED that should be toggled by the Rx and Tx tasks.  The Rx task will\r
 toggle LED ( uxBaseLED + comRX_LED_OFFSET).  The Tx task will toggle LED\r
 ( uxBaseLED + comTX_LED_OFFSET ). */\r
-static unsigned portBASE_TYPE uxBaseLED = 0;\r
+static UBaseType_t uxBaseLED = 0;\r
 \r
 /* Check variable used to ensure no error have occurred.  The Rx task will\r
 increment this variable after every successfully received sequence.  If at any\r
 time the sequence is incorrect the the variable will stop being incremented. */\r
-static volatile unsigned portBASE_TYPE uxRxLoops = comINITIAL_RX_COUNT_VALUE;\r
+static volatile UBaseType_t uxRxLoops = comINITIAL_RX_COUNT_VALUE;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
-void vAltStartComTestTasks( unsigned portBASE_TYPE uxPriority, unsigned long ulBaudRate, unsigned portBASE_TYPE uxLED )\r
+void vAltStartComTestTasks( UBaseType_t uxPriority, uint32_t ulBaudRate, UBaseType_t uxLED )\r
 {\r
        /* Initialise the com port then spawn the Rx and Tx tasks. */\r
        uxBaseLED = uxLED;\r
@@ -208,7 +208,7 @@ TickType_t xTimeToWait;
 static portTASK_FUNCTION( vComRxTask, pvParameters )\r
 {\r
 signed char cExpectedByte, cByteRxed;\r
-portBASE_TYPE xResyncRequired = pdFALSE, xErrorOccurred = pdFALSE;\r
+BaseType_t xResyncRequired = pdFALSE, xErrorOccurred = pdFALSE;\r
 \r
        /* Just to stop compiler warnings. */\r
        ( void ) pvParameters;\r
@@ -278,9 +278,9 @@ portBASE_TYPE xResyncRequired = pdFALSE, xErrorOccurred = pdFALSE;
 } /*lint !e715 !e818 pvParameters is required for a task function even if it is not referenced. */\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xAreComTestTasksStillRunning( void )\r
+BaseType_t xAreComTestTasksStillRunning( void )\r
 {\r
-portBASE_TYPE xReturn;\r
+BaseType_t xReturn;\r
 \r
        /* If the count of successful reception loops has not changed than at\r
        some time an error occurred (i.e. a character was received out of sequence)\r