/*\r
- FreeRTOS.org V5.0.2 - Copyright (C) 2003-2008 Richard Barry.\r
-\r
- This file is part of the FreeRTOS.org distribution.\r
-\r
- FreeRTOS.org is free software; you can redistribute it and/or modify\r
- it under the terms of the GNU General Public License as published by\r
- the Free Software Foundation; either version 2 of the License, or\r
- (at your option) any later version.\r
-\r
- FreeRTOS.org is distributed in the hope that it will be useful,\r
- but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
- GNU General Public License for more details.\r
-\r
- You should have received a copy of the GNU General Public License\r
- along with FreeRTOS.org; if not, write to the Free Software\r
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\r
-\r
- A special exception to the GPL can be applied should you wish to distribute\r
- a combined work that includes FreeRTOS.org, without being obliged to provide\r
- the source code for any proprietary components. See the licensing section \r
- of http://www.FreeRTOS.org for full details of how and when the exception\r
- can be applied.\r
+ FreeRTOS V7.1.1 - Copyright (C) 2012 Real Time Engineers Ltd.\r
+ \r
\r
***************************************************************************\r
+ * *\r
+ * FreeRTOS tutorial books are available in pdf and paperback. *\r
+ * Complete, revised, and edited pdf reference manuals are also *\r
+ * available. *\r
+ * *\r
+ * Purchasing FreeRTOS documentation will not only help you, by *\r
+ * ensuring you get running as quickly as possible and with an *\r
+ * in-depth knowledge of how to use FreeRTOS, it will also help *\r
+ * the FreeRTOS project to continue with its mission of providing *\r
+ * professional grade, cross platform, de facto standard solutions *\r
+ * for microcontrollers - completely free of charge! *\r
+ * *\r
+ * >>> See http://www.FreeRTOS.org/Documentation for details. <<< *\r
+ * *\r
+ * Thank you for using FreeRTOS, and thank you for your support! *\r
+ * *\r
***************************************************************************\r
- * *\r
- * SAVE TIME AND MONEY! We can port FreeRTOS.org to your own hardware, *\r
- * and even write all or part of your application on your behalf. *\r
- * See http://www.OpenRTOS.com for details of the services we provide to *\r
- * expedite your project. *\r
- * *\r
- ***************************************************************************\r
- ***************************************************************************\r
-\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
\r
- http://www.SafeRTOS.com - A version that is certified for use in safety \r
- critical systems.\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 modification to the GPL is included to allow you to\r
+ distribute a combined work that includes FreeRTOS without being obliged to\r
+ provide the source code for proprietary components outside of the FreeRTOS\r
+ kernel. FreeRTOS is distributed in the hope that it will be useful, but\r
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\r
+ more details. You should have received a copy of the GNU General Public\r
+ License and the FreeRTOS license exception along with FreeRTOS; if not it\r
+ can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
+ by writing to Richard Barry, contact details for whom are available on the\r
+ FreeRTOS WEB site.\r
+\r
+ 1 tab == 4 spaces!\r
+ \r
+ ***************************************************************************\r
+ * *\r
+ * Having a problem? Start by reading the FAQ "My application does *\r
+ * not run, what could be wrong? *\r
+ * *\r
+ * http://www.FreeRTOS.org/FAQHelp.html *\r
+ * *\r
+ ***************************************************************************\r
\r
- http://www.OpenRTOS.com - Commercial support, development, porting, \r
- licensing and training services.\r
+ \r
+ http://www.FreeRTOS.org - Documentation, training, latest information, \r
+ license and contact details.\r
+ \r
+ http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
+ including FreeRTOS+Trace - an indispensable productivity tool.\r
+\r
+ Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell \r
+ the code with commercial support, indemnification, and middleware, under \r
+ the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also\r
+ provide a safety engineered and independently SIL3 certified version under \r
+ the SafeRTOS brand: http://www.SafeRTOS.com.\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
+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 cChar;\r
-portBASE_TYPE 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
may have a higher priority than the task we have interrupted. */\r
- cChar = UDR;\r
+ ucChar = UDR;\r
\r
- xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );\r
+ xQueueSendFromISR( xRxedChars, &ucChar, &xHigherPriorityTaskWoken );\r
\r
if( xHigherPriorityTaskWoken != pdFALSE )\r
{\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