/*\r
- FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 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
-\r
- ***************************************************************************\r
- See http://www.FreeRTOS.org for documentation, latest information, license \r
- and contact details. Please ensure to read the configuration and relevant \r
- port sections of the online documentation.\r
- ***************************************************************************\r
+ FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.\r
+\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
+\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
+\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
+\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
+\r
+ http://www.OpenRTOS.com - Commercial support, development, porting,\r
+ licensing and training services.\r
*/\r
\r
\r
/*-----------------------------------------------------------*/\r
\r
/* Constant to access the AIC. */\r
-#define serCLEAR_AIC_INTERRUPT ( ( unsigned portLONG ) 0 )\r
+#define serCLEAR_AIC_INTERRUPT ( ( unsigned long ) 0 )\r
\r
/* Constants to determine the ISR source. */\r
-#define serSOURCE_THRE ( ( unsigned portCHAR ) 0x02 )\r
-#define serSOURCE_RX_TIMEOUT ( ( unsigned portCHAR ) 0x0c )\r
-#define serSOURCE_ERROR ( ( unsigned portCHAR ) 0x06 )\r
-#define serSOURCE_RX ( ( unsigned portCHAR ) 0x04 )\r
-#define serINTERRUPT_SOURCE_MASK ( ( unsigned portLONG ) (US_RXRDY | US_TXRDY | US_RXBRK | US_OVRE | US_FRAME | US_PARE) )\r
+#define serSOURCE_THRE ( ( unsigned char ) 0x02 )\r
+#define serSOURCE_RX_TIMEOUT ( ( unsigned char ) 0x0c )\r
+#define serSOURCE_ERROR ( ( unsigned char ) 0x06 )\r
+#define serSOURCE_RX ( ( unsigned char ) 0x04 )\r
+#define serINTERRUPT_SOURCE_MASK ( ( unsigned long ) (US_RXRDY | US_TXRDY | US_RXBRK | US_OVRE | US_FRAME | US_PARE) )\r
\r
/* Queues used to hold received characters, and characters waiting to be\r
transmitted. */\r
\r
/* The ISR function that actually performs the work. This must be separate \r
from the wrapper to ensure the correct stack frame is set up. */\r
-void vUART_ISR_Handler( void );\r
+void vUART_ISR_Handler( void ) __attribute__ ((noinline));\r
\r
/*-----------------------------------------------------------*/\r
void vSerialISRCreateQueues( unsigned portBASE_TYPE uxQueueLength, xQueueHandle *pxRxedChars, xQueueHandle *pxCharsForTx )\r
{\r
/* Create the queues used to hold Rx and Tx characters. */\r
- xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );\r
- xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );\r
+ xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );\r
+ xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) );\r
\r
/* Pass back a reference to the queues so the serial API file can \r
post/receive characters. */\r
\r
/* Call the handler. This must be a separate function to ensure the \r
stack frame is correctly set up. */\r
- vUART_ISR_Handler();\r
+ __asm volatile( "bl vUART_ISR_Handler" );\r
\r
/* Restore the context of whichever task will run next. */\r
portRESTORE_CONTEXT();\r
void vUART_ISR_Handler( void )\r
{\r
/* Now we can declare the local variables. These must be static. */\r
-signed portCHAR cChar;\r
-portBASE_TYPE xTaskWokenByTx = pdFALSE, xTaskWokenByRx = pdFALSE;\r
-unsigned portLONG ulStatus;\r
+signed char cChar;\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
+unsigned long ulStatus;\r
\r
/* What caused the interrupt? */\r
ulStatus = AT91C_BASE_US0->US_CSR & AT91C_BASE_US0->US_IMR;\r
{\r
/* The interrupt was caused by the THR becoming empty. Are there any\r
more characters to transmit? */\r
- if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWokenByTx ) == pdTRUE )\r
+ if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )\r
{\r
/* A character was retrieved from the queue so can be sent to the\r
THR now. */\r
/* The interrupt was caused by the receiver getting data. */\r
cChar = AT91C_BASE_US0->US_RHR;\r
\r
- if (xQueueSendFromISR(xRxedChars, &cChar, pdFALSE))\r
- {\r
- xTaskWokenByRx = pdTRUE;\r
- }\r
+ xQueueSendFromISR(xRxedChars, &cChar, &xHigherPriorityTaskWoken);\r
}\r
\r
/* Acknowledge the interrupt at AIC level... */\r
ensure that the unblocked task is the task that executes when the interrupt\r
completes if the unblocked task has a priority higher than the interrupted\r
task. */\r
- if( xTaskWokenByTx || xTaskWokenByRx )\r
+ if( xHigherPriorityTaskWoken )\r
{\r
portYIELD_FROM_ISR();\r
}\r
projects / freertos / blobdiff