X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FColdFire_MCF5282_Eclipse%2FRTOSDemo%2Fserial%2Fserial.c;h=5b2d822cc5c4e72c960b444bd4c12659da4ff4c7;hb=3d511cabadf346c67f0f56e15e999c02ca0393ed;hp=6355692c1b01bbc6b719407f92e74a6be7074fa7;hpb=7f682e03ddc9f629d828cb8b61033bba85d9df67;p=freertos

diff --git a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c
index 6355692c1..5b2d822cc 100644
--- a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c
+++ b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c
@@ -1,5 +1,6 @@
 /*
-    FreeRTOS V7.5.1 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd. 
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
@@ -23,10 +24,10 @@
     the terms of the GNU General Public License (version 2) as published by the
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -81,21 +82,21 @@ an example of an efficient driver. */
 #include "serial.h"
 
 /* Hardware definitions. */
-#define serNO_PARITY		( ( unsigned portCHAR ) 0x02 << 3 )
-#define ser8DATA_BITS		( ( unsigned portCHAR ) 0x03 )
-#define ser1STOP_BIT		( ( unsigned portCHAR ) 0x07 )
-#define serSYSTEM_CLOCK		( ( unsigned portCHAR ) 0xdd )
-#define serTX_OUTPUT		( ( unsigned portCHAR ) 0x04 )
-#define serRX_INPUT			( ( unsigned portCHAR ) 0x08 )
-#define serTX_ENABLE		( ( unsigned portCHAR ) 0x04 )
-#define serRX_ENABLE		( ( unsigned portCHAR ) 0x01 )
-#define serTX_INT			( ( unsigned portCHAR ) 0x01 )
-#define serRX_INT			( ( unsigned portCHAR ) 0x02 )
+#define serNO_PARITY		( ( unsigned char ) 0x02 << 3 )
+#define ser8DATA_BITS		( ( unsigned char ) 0x03 )
+#define ser1STOP_BIT		( ( unsigned char ) 0x07 )
+#define serSYSTEM_CLOCK		( ( unsigned char ) 0xdd )
+#define serTX_OUTPUT		( ( unsigned char ) 0x04 )
+#define serRX_INPUT			( ( unsigned char ) 0x08 )
+#define serTX_ENABLE		( ( unsigned char ) 0x04 )
+#define serRX_ENABLE		( ( unsigned char ) 0x01 )
+#define serTX_INT			( ( unsigned char ) 0x01 )
+#define serRX_INT			( ( unsigned char ) 0x02 )
 
 
 /* The queues used to communicate between tasks and ISR's. */
-static xQueueHandle xRxedChars;
-static xQueueHandle xCharsForTx;
+static QueueHandle_t xRxedChars;
+static QueueHandle_t xCharsForTx;
 
 /* Flag used to indicate the tx status. */
 static portBASE_TYPE xTxHasEnded = pdTRUE;
@@ -107,13 +108,13 @@ void __attribute__( ( interrupt ) ) __cs3_isr_interrupt_78( void );
 
 /*-----------------------------------------------------------*/
 
-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
 {
-const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWantedBaud ) );
+const unsigned long ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWantedBaud ) );
 
 	/* Create the queues used by the com test task. */
-	xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );
-	xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );
+	xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );
+	xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );
 
 	xTxHasEnded = pdTRUE;
 
@@ -132,8 +133,8 @@ const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWa
 	MCF_UART1_UMR2 = ser1STOP_BIT;
 	MCF_UART1_UCSR = serSYSTEM_CLOCK;
 
-	MCF_UART1_UBG1 = ( unsigned portCHAR ) ( ( ulBaudRateDivisor >> 8UL ) & 0xffUL );
-	MCF_UART1_UBG2 = ( unsigned portCHAR ) ( ulBaudRateDivisor & 0xffUL );
+	MCF_UART1_UBG1 = ( unsigned char ) ( ( ulBaudRateDivisor >> 8UL ) & 0xffUL );
+	MCF_UART1_UBG2 = ( unsigned char ) ( ulBaudRateDivisor & 0xffUL );
 
 	/* Turn it on. */
 	MCF_UART1_UCR = serTX_ENABLE | serRX_ENABLE;
@@ -151,7 +152,7 @@ const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWa
 }
 /*-----------------------------------------------------------*/
 
-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )
+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, TickType_t xBlockTime )
 {
 	/* Only one port is supported. */
 	( void ) pxPort;
@@ -169,7 +170,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR
 }
 /*-----------------------------------------------------------*/
 
-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )
+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, TickType_t xBlockTime )
 {
 	/* Only one port is supported. */
 	( void ) pxPort;
@@ -200,7 +201,7 @@ void vSerialClose( xComPortHandle xPort )
 
 void __cs3_isr_interrupt_78( void )
 {
-unsigned portCHAR ucChar;
+unsigned char ucChar;
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE, xDoneSomething = pdTRUE;
 
 	while( xDoneSomething != pdFALSE )