/*\r
- FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.\r
+ FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.\r
\r
- This file is part of the FreeRTOS distribution.\r
+ This file is part of the FreeRTOS distribution.\r
\r
- FreeRTOS is free software; you can redistribute it and/or modify it under \r
- 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
- **NOTE** The exception to the GPL is included to allow you to distribute a\r
- combined work that includes FreeRTOS without being obliged to provide the \r
- source code for proprietary components outside of the FreeRTOS kernel. \r
- Alternative commercial license and support terms are also available upon \r
- request. See the licensing section of http://www.FreeRTOS.org for full \r
- license details.\r
+ FreeRTOS is free software; you can redistribute it and/or modify it under\r
+ 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
+ **NOTE** The exception to the GPL is included to allow you to distribute a\r
+ combined work that includes FreeRTOS without being obliged to provide the\r
+ source code for proprietary components outside of the FreeRTOS kernel.\r
+ Alternative commercial license and support terms are also available upon\r
+ request. See the licensing section of http://www.FreeRTOS.org for full\r
+ license details.\r
\r
- FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\r
- more details.\r
+ FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\r
+ more details.\r
\r
- You should have received a copy of the GNU General Public License along\r
- with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59\r
- Temple Place, Suite 330, Boston, MA 02111-1307 USA.\r
+ You should have received a copy of the GNU General Public License along\r
+ with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59\r
+ Temple Place, Suite 330, Boston, MA 02111-1307 USA.\r
\r
\r
- ***************************************************************************\r
- * *\r
- * Looking for a quick start? Then check out the FreeRTOS eBook! *\r
- * See http://www.FreeRTOS.org/Documentation for details *\r
- * *\r
- ***************************************************************************\r
+ ***************************************************************************\r
+ * *\r
+ * The FreeRTOS eBook and reference manual are available to purchase for a *\r
+ * small fee. Help yourself get started quickly while also helping the *\r
+ * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *\r
+ * *\r
+ ***************************************************************************\r
\r
- 1 tab == 4 spaces!\r
+ 1 tab == 4 spaces!\r
\r
- Please ensure to read the configuration and relevant port sections of the\r
- online documentation.\r
+ Please ensure to read the configuration and relevant port sections of the\r
+ online documentation.\r
\r
- http://www.FreeRTOS.org - Documentation, latest information, license and\r
- contact details.\r
+ http://www.FreeRTOS.org - Documentation, latest information, license and\r
+ contact details.\r
\r
- http://www.SafeRTOS.com - A version that is certified for use in safety\r
- critical systems.\r
+ http://www.SafeRTOS.com - A version that is certified for use in safety\r
+ critical systems.\r
\r
- http://www.OpenRTOS.com - Commercial support, development, porting,\r
- licensing and training services.\r
+ http://www.OpenRTOS.com - Commercial support, development, porting,\r
+ licensing and training services.\r
*/\r
\r
\r
#include "task.h"\r
#include "serial.h"\r
\r
-#define serBAUD_DIV_CONSTANT ( ( unsigned portLONG ) 16 )\r
+#define serBAUD_DIV_CONSTANT ( ( unsigned long ) 16 )\r
\r
/* Constants for writing to UCSRB. */\r
-#define serRX_INT_ENABLE ( ( unsigned portCHAR ) 0x80 )\r
-#define serRX_ENABLE ( ( unsigned portCHAR ) 0x10 )\r
-#define serTX_ENABLE ( ( unsigned portCHAR ) 0x08 )\r
-#define serTX_INT_ENABLE ( ( unsigned portCHAR ) 0x20 )\r
+#define serRX_INT_ENABLE ( ( unsigned char ) 0x80 )\r
+#define serRX_ENABLE ( ( unsigned char ) 0x10 )\r
+#define serTX_ENABLE ( ( unsigned char ) 0x08 )\r
+#define serTX_INT_ENABLE ( ( unsigned char ) 0x20 )\r
\r
/* Constants for writing to UCSRC. */\r
-#define serUCSRC_SELECT ( ( unsigned portCHAR ) 0x80 )\r
-#define serEIGHT_DATA_BITS ( ( unsigned portCHAR ) 0x06 )\r
+#define serUCSRC_SELECT ( ( unsigned char ) 0x80 )\r
+#define serEIGHT_DATA_BITS ( ( unsigned char ) 0x06 )\r
\r
static xQueueHandle xRxedChars;\r
static xQueueHandle xCharsForTx;\r
\r
#define vInterruptOn() \\r
{ \\r
- unsigned portCHAR ucByte; \\r
+ unsigned char ucByte; \\r
\\r
ucByte = UCSRB; \\r
ucByte |= serTX_INT_ENABLE; \\r
\r
#define vInterruptOff() \\r
{ \\r
- unsigned portCHAR ucByte; \\r
+ unsigned char ucByte; \\r
\\r
ucByte = UCSRB; \\r
ucByte &= ~serTX_INT_ENABLE; \\r
}\r
/*-----------------------------------------------------------*/\r
\r
-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )\r
+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )\r
{\r
-unsigned portLONG ulBaudRateCounter;\r
-unsigned portCHAR ucByte;\r
+unsigned long ulBaudRateCounter;\r
+unsigned char ucByte;\r
\r
portENTER_CRITICAL();\r
{\r
/* Create the queues used by the com test task. */\r
- xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );\r
- xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );\r
+ xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );\r
+ xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );\r
\r
/* Calculate the baud rate register value from the equation in the\r
data sheet. */\r
- ulBaudRateCounter = ( configCPU_CLOCK_HZ / ( serBAUD_DIV_CONSTANT * ulWantedBaud ) ) - ( unsigned portLONG ) 1;\r
+ ulBaudRateCounter = ( configCPU_CLOCK_HZ / ( serBAUD_DIV_CONSTANT * ulWantedBaud ) ) - ( unsigned long ) 1;\r
\r
/* Set the baud rate. */ \r
- ucByte = ( unsigned portCHAR ) ( ulBaudRateCounter & ( unsigned portLONG ) 0xff ); \r
+ ucByte = ( unsigned char ) ( ulBaudRateCounter & ( unsigned long ) 0xff ); \r
outb( UBRRL, ucByte );\r
\r
- ulBaudRateCounter >>= ( unsigned portLONG ) 8;\r
- ucByte = ( unsigned portCHAR ) ( ulBaudRateCounter & ( unsigned portLONG ) 0xff ); \r
+ ulBaudRateCounter >>= ( unsigned long ) 8;\r
+ ucByte = ( unsigned char ) ( ulBaudRateCounter & ( unsigned long ) 0xff ); \r
outb( UBRRH, ucByte );\r
\r
/* Enable the Rx interrupt. The Tx interrupt will get enabled\r
}\r
/*-----------------------------------------------------------*/\r
\r
-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )\r
+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )\r
{\r
/* Get the next character from the buffer. Return false if no characters\r
are available, or arrive before xBlockTime expires. */\r
}\r
/*-----------------------------------------------------------*/\r
\r
-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )\r
+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )\r
{\r
/* Return false if after the block time there is no room on the Tx queue. */\r
if( xQueueSend( xCharsForTx, &cOutChar, xBlockTime ) != pdPASS )\r
\r
void vSerialClose( xComPortHandle xPort )\r
{\r
-unsigned portCHAR ucByte;\r
+unsigned char ucByte;\r
\r
/* Turn off the interrupts. We may also want to delete the queues and/or\r
re-install the original ISR. */\r
\r
__interrupt void SIG_UART_RECV( void )\r
{\r
-signed portCHAR ucChar, xHigherPriorityTaskWoken = pdFALSE;\r
+signed char ucChar, xHigherPriorityTaskWoken = pdFALSE;\r
\r
/* Get the character and post it on the queue of Rxed characters.\r
If the post causes a task to wake force a context switch as the woken task\r
\r
__interrupt void SIG_UART_DATA( void )\r
{\r
-signed portCHAR cChar, cTaskWoken = pdFALSE;\r
+signed char cChar, cTaskWoken = pdFALSE;\r
\r
if( xQueueReceiveFromISR( xCharsForTx, &cChar, &cTaskWoken ) == pdTRUE )\r
{\r
projects / freertos / blobdiff