Ready for V5.1.1 release.

[freertos] / Demo / ARM7_STR71x_IAR / serial / serial.c

diff --git a/Demo/ARM7_STR71x_IAR/serial/serial.c b/Demo/ARM7_STR71x_IAR/serial/serial.c
index 11e1d5b149153bc1124b3ab090d54704b29ed4ae..47fc914afc107a4fc5e37cdcfc44a4c7500a6ed9 100644 (file)
--- a/Demo/ARM7_STR71x_IAR/serial/serial.c
+++ b/Demo/ARM7_STR71x_IAR/serial/serial.c
@@ -1,33 +1,50 @@
 /*\r
-       FreeRTOS V4.0.1 - Copyright (C) 2003-2006 Richard Barry.\r
+       FreeRTOS.org V5.1.1 - Copyright (C) 2003-2008 Richard Barry.\r
 \r
-       This file is part of the FreeRTOS distribution.\r
+       This file is part of the FreeRTOS.org distribution.\r
 \r
-       FreeRTOS is free software; you can redistribute it and/or modify\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 is distributed in the hope that it will be useful,\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; if not, write to the Free Software\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, without being obliged to provide\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
+    ***************************************************************************\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
+\r
+       http://www.OpenRTOS.com - Commercial support, development, porting, \r
+       licensing and training services.\r
 */\r
 \r
 /*\r
@@ -196,7 +213,7 @@ __arm void vSerialISR( void )
 {\r
 unsigned portSHORT usStatus;\r
 signed portCHAR cChar;\r
-portBASE_TYPE xTaskWokenByTx = pdFALSE, xTaskWokenByPost = pdFALSE;\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 \r
        /* What caused the interrupt? */\r
        usStatus = UART_FlagStatus( UART0 );\r
@@ -205,7 +222,7 @@ portBASE_TYPE xTaskWokenByTx = pdFALSE, xTaskWokenByPost = pdFALSE;
        {\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
@@ -224,12 +241,12 @@ portBASE_TYPE xTaskWokenByTx = pdFALSE, xTaskWokenByPost = pdFALSE;
                character from the RHR and place it in the queue of received\r
                characters. */\r
                cChar = UART0->RxBUFR;\r
-               xTaskWokenByPost = xQueueSendFromISR( xRxedChars, &cChar, xTaskWokenByPost );\r
+               xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );\r
        }\r
 \r
        /* If a task was woken by either a character being received or a character\r
        being transmitted then we may need to switch to another task. */\r
-       portEND_SWITCHING_ISR( ( xTaskWokenByPost || xTaskWokenByTx ) );\r
+       portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );\r
 \r
        /* End the interrupt in the EIC. */\r
        portCLEAR_EIC();\r