/*\r
- FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.\r
+ FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.\r
\r
- This file is part of the FreeRTOS.org distribution.\r
+ This file is part of the FreeRTOS 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
+ 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.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
+ 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\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
+ 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
- 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
\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
- Please ensure to read the configuration and relevant port sections of the \r
- online documentation.\r
+ 1 tab == 4 spaces!\r
\r
- +++ http://www.FreeRTOS.org +++\r
- Documentation, latest information, license and contact details. \r
+ Please ensure to read the configuration and relevant port sections of the\r
+ online documentation.\r
\r
- +++ http://www.SafeRTOS.com +++\r
- A version that is certified for use in safety critical systems.\r
+ http://www.FreeRTOS.org - Documentation, latest information, license and\r
+ contact details.\r
\r
- +++ http://www.OpenRTOS.com +++\r
- Commercial support, development, porting, licensing and training services.\r
+ http://www.SafeRTOS.com - A version that is certified for use in safety\r
+ critical systems.\r
\r
- ***************************************************************************\r
+ http://www.OpenRTOS.com - Commercial support, development, porting,\r
+ licensing and training services.\r
*/\r
\r
\r
#include "serial.h"\r
\r
/* Constants required to setup the hardware. */\r
-#define serTX_AND_RX ( ( unsigned portCHAR ) 0x03 )\r
+#define serTX_AND_RX ( ( unsigned char ) 0x03 )\r
\r
/* Misc. constants. */\r
#define serNO_BLOCK ( ( portTickType ) 0 )\r
/* The queue used to hold characters waiting transmission. */\r
static xQueueHandle xCharsForTx; \r
\r
-static volatile portSHORT sTHREEmpty;\r
+static volatile short sTHREEmpty;\r
\r
/* Interrupt service routines. */\r
-interrupt (UART1RX_VECTOR) vRxISR( void );\r
-interrupt (UART1TX_VECTOR) vTxISR( void );\r
+interrupt (UART1RX_VECTOR) wakeup vRxISR( void );\r
+interrupt (UART1TX_VECTOR) wakeup vTxISR( void );\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 ulBaudRateCount;\r
+unsigned long ulBaudRateCount;\r
\r
/* Initialise the hardware. */\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
/* Reset UART. */\r
UCTL1 |= SWRST;\r
U1TCTL |= SSEL1;\r
\r
/* Setup baud rate low byte. */\r
- U1BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );\r
+ U1BR0 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff );\r
\r
/* Setup baud rate high byte. */\r
ulBaudRateCount >>= 8UL;\r
- U1BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );\r
+ U1BR1 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff );\r
\r
/* Enable ports. */\r
ME2 |= UTXE1 + URXE1;\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
signed portBASE_TYPE xReturn;\r
\r
/*\r
* UART RX interrupt service routine.\r
*/\r
-interrupt (UART1RX_VECTOR) vRxISR( void )\r
+interrupt (UART1RX_VECTOR) wakeup vRxISR( void )\r
{\r
-signed portCHAR cChar;\r
+signed char cChar;\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
\r
/* Get the character from the UART and post it on the queue of Rxed \r
characters. */\r
cChar = U1RXBUF;\r
\r
- if( xQueueSendFromISR( xRxedChars, &cChar, pdFALSE ) )\r
+ xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );\r
+\r
+ if( xHigherPriorityTaskWoken )\r
{\r
/*If the post causes a task to wake force a context switch \r
as the woken task may have a higher priority than the task we have \r
/*\r
* UART Tx interrupt service routine.\r
*/\r
-interrupt (UART1TX_VECTOR) vTxISR( void )\r
+interrupt (UART1TX_VECTOR) wakeup vTxISR( void )\r
{\r
-signed portCHAR cChar;\r
-portBASE_TYPE xTaskWoken;\r
+signed char cChar;\r
+portBASE_TYPE xTaskWoken = pdFALSE;\r
\r
/* The previous character has been transmitted. See if there are any\r
further characters waiting transmission. */\r
projects / freertos / blobdiff