/*\r
- FreeRTOS.org V5.0.3 - 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
- * 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
+ * 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
\r
- Please ensure to read the configuration and relevant port sections of the\r
- online documentation.\r
+ 1 tab == 4 spaces!\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
+ 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 "serial.h"\r
\r
/* Hardware definitions. */\r
-#define serNO_PARITY ( ( unsigned portCHAR ) 0x10 << 3 )\r
-#define ser8DATA_BITS ( ( unsigned portCHAR ) 0x11 )\r
-#define ser1STOP_BIT ( ( unsigned portCHAR ) 0x111 )\r
+#define serNO_PARITY ( ( unsigned portCHAR ) 0x02 << 3 )\r
+#define ser8DATA_BITS ( ( unsigned portCHAR ) 0x03 )\r
+#define ser1STOP_BIT ( ( unsigned portCHAR ) 0x07 )\r
#define serSYSTEM_CLOCK ( ( unsigned portCHAR ) 0xdd )\r
#define serTX_OUTPUT ( ( unsigned portCHAR ) 0x04 )\r
#define serRX_INPUT ( ( unsigned portCHAR ) 0x08 )\r
static xQueueHandle xCharsForTx;\r
\r
/* Flag used to indicate the tx status. */\r
-static portBASE_TYPE xTxHasEnded;\r
+static portBASE_TYPE xTxHasEnded = pdTRUE;\r
\r
/*-----------------------------------------------------------*/\r
\r
\r
xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )\r
{\r
-const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32 * ulWantedBaud ) );\r
+const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWantedBaud ) );\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
\r
+ xTxHasEnded = pdTRUE;\r
+\r
/* Set the pins to UART mode. */\r
MCF_PAD_PUAPAR |= ( serTX_OUTPUT | serRX_INPUT );\r
\r
+ /* Reset the peripheral. */\r
+ MCF_UART1_UCR = MCF_UART_UCR_RESET_RX;\r
+ MCF_UART1_UCR = MCF_UART_UCR_RESET_TX;\r
+ MCF_UART1_UCR = MCF_UART_UCR_RESET_ERROR;\r
+ MCF_UART1_UCR = MCF_UART_UCR_RESET_BKCHGINT;\r
+ MCF_UART1_UCR = MCF_UART_UCR_RESET_MR | MCF_UART_UCR_RX_DISABLED | MCF_UART_UCR_TX_DISABLED;\r
+\r
/* Configure the UART. */\r
MCF_UART1_UMR1 = serNO_PARITY | ser8DATA_BITS;\r
MCF_UART1_UMR2 = ser1STOP_BIT;\r
MCF_UART1_UBG1 = ( unsigned portCHAR ) ( ( ulBaudRateDivisor >> 8UL ) & 0xffUL );\r
MCF_UART1_UBG2 = ( unsigned portCHAR ) ( ulBaudRateDivisor & 0xffUL );\r
\r
- /* Reset the peripheral before turning it on. */\r
- MCF_UART1_UCR = MCF_UART_UCR_RESET_MR;\r
- MCF_UART1_UCR = MCF_UART_UCR_RESET_RX;\r
- MCF_UART1_UCR = MCF_UART_UCR_RESET_TX;\r
- MCF_UART1_UCR = MCF_UART_UCR_RESET_ERROR;\r
+ /* Turn it on. */\r
MCF_UART1_UCR = serTX_ENABLE | serRX_ENABLE;\r
\r
/* Configure the interrupt controller. Run the UARTs above the kernel\r
interrupt priority for demo purposes. */\r
- MCF_INTC0_ICR14 = ( ( configKERNEL_INTERRUPT_PRIORITY + 1 ) | ( 1 << 3 ) );\r
- MCF_INTC0_IMRL &= ~MCF_INTC_IMRL_INT_MASK14;\r
+ MCF_INTC0_ICR14 = ( ( configMAX_SYSCALL_INTERRUPT_PRIORITY - 2 ) << 3 );\r
+ MCF_INTC0_IMRL &= ~( MCF_INTC_IMRL_INT_MASK14 | 0x01 );\r
\r
/* The Tx interrupt is not enabled until there is data to send. */\r
- MCF_UART0_UIMR = serRX_INT;\r
+ MCF_UART1_UIMR = serRX_INT;\r
\r
/* Only a single port is implemented so we don't need to return anything. */\r
return NULL;\r
\r
/* A critical section should not be required as xTxHasEnded will not be\r
written to by the ISR if it is already 0 (is this correct?). */\r
- if( xTxHasEnded )\r
+ if( xTxHasEnded != pdFALSE )\r
{\r
xTxHasEnded = pdFALSE;\r
- MCF_UART0_UIMR = serRX_INT | serTX_INT;\r
+ MCF_UART1_UIMR = serRX_INT | serTX_INT;\r
}\r
\r
return pdPASS;\r
xDoneSomething = pdFALSE;\r
\r
/* Does the tx buffer contain space? */\r
- if( ( MCF_UART0_USR & MCF_UART_USR_TXRDY ) != 0x00 )\r
+ if( ( MCF_UART1_USR & MCF_UART_USR_TXRDY ) != 0x00 )\r
{\r
/* Are there any characters queued to be sent? */\r
if( xQueueReceiveFromISR( xCharsForTx, &ucChar, &xHigherPriorityTaskWoken ) == pdTRUE )\r
{\r
/* Send the next char. */\r
- MCF_UART0_UTB = ucChar;\r
+ MCF_UART1_UTB = ucChar;\r
xDoneSomething = pdTRUE;\r
}\r
else\r
{\r
/* Turn off the Tx interrupt until such time as another character\r
- is being transmitted. */
- MCF_UART0_UIMR = serRX_INT;\r
+ is being transmitted. */\r
+ MCF_UART1_UIMR = serRX_INT;\r
+ xTxHasEnded = pdTRUE;\r
}\r
}\r
\r
- if( MCF_UART0_USR & MCF_UART_USR_RXRDY )\r
+ if( MCF_UART1_USR & MCF_UART_USR_RXRDY )\r
{\r
- ucChar = MCF_UART0_URB;\r
+ ucChar = MCF_UART1_URB;\r
xQueueSendFromISR( xRxedChars, &ucChar, &xHigherPriorityTaskWoken );\r
xDoneSomething = pdTRUE;\r
}\r
projects / freertos / blobdiff