Ready for V5.1.1 release.

[freertos] / Demo / CORTEX_LM3S102_KEIL / Demo1 / main.c

diff --git a/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c b/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c
index 1a18a441ec3dfdb92201dea19f991f0bcdd0f7c5..a27896fa17356a3c78a9fd66019df6856b5a25ed 100644 (file)
--- a/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c
+++ b/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c
@@ -1,5 +1,5 @@
 /*\r
-       FreeRTOS.org V4.0.3 - 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.org distribution.\r
 \r
@@ -23,11 +23,28 @@
        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
@@ -479,7 +496,7 @@ void vUART_ISR(void)
 {\r
 unsigned portLONG ulStatus;\r
 portCHAR cRxedChar;\r
-portBASE_TYPE xTaskWokenByPost = pdFALSE;\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 \r
        /* What caused the interrupt. */\r
        ulStatus = UARTIntStatus( UART0_BASE, pdTRUE );\r
@@ -496,7 +513,7 @@ portBASE_TYPE xTaskWokenByPost = pdFALSE;
                        Rxed chars.  Posting the character should wake the task that is \r
                        blocked on the queue waiting for characters. */\r
                        cRxedChar = ( portCHAR ) HWREG( UART0_BASE + UART_O_DR );\r
-                       xTaskWokenByPost = xQueueSendFromISR( xCommsQueue, &cRxedChar, xTaskWokenByPost );\r
+                       xQueueSendFromISR( xCommsQueue, &cRxedChar, &xHigherPriorityTaskWoken );\r
                }               \r
        }\r
 \r
@@ -514,14 +531,11 @@ portBASE_TYPE xTaskWokenByPost = pdFALSE;
                }\r
        }\r
        \r
-       if( xTaskWokenByPost )\r
-       {\r
-               /* If a task was woken by the character being received then we force\r
-               a context switch to occur in case the task is of higher priority than\r
-               the currently executing task (i.e. the task that this interrupt \r
-               interrupted.) */\r
-               portEND_SWITCHING_ISR( xTaskWokenByPost );\r
-       }\r
+       /* If a task was woken by the character being received then we force\r
+       a context switch to occur in case the task is of higher priority than\r
+       the currently executing task (i.e. the task that this interrupt \r
+       interrupted.) */\r
+       portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r