Ready for V5.1.1 release.

[freertos] / Demo / CORTEX_LM3S811_IAR / main.c

diff --git a/Demo/CORTEX_LM3S811_IAR/main.c b/Demo/CORTEX_LM3S811_IAR/main.c
index 0cfe5b2b042251f32081a86ca1374a37f0f35fe8..dce1f107c188816f739315fcd338a7cf565325f4 100644 (file)
--- a/Demo/CORTEX_LM3S811_IAR/main.c
+++ b/Demo/CORTEX_LM3S811_IAR/main.c
@@ -1,5 +1,5 @@
 /*\r
-       FreeRTOS.org V4.1.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
@@ -236,6 +253,7 @@ static void prvSetupHardware( void )
        SysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOC);\r
     GPIODirModeSet(GPIO_PORTC_BASE, mainPUSH_BUTTON, GPIO_DIR_MODE_IN);\r
        GPIOIntTypeSet( GPIO_PORTC_BASE, mainPUSH_BUTTON,GPIO_FALLING_EDGE );\r
+       IntPrioritySet( INT_GPIOC, configKERNEL_INTERRUPT_PRIORITY );\r
        GPIOPinIntEnable( GPIO_PORTC_BASE, mainPUSH_BUTTON );\r
        IntEnable( INT_GPIOC );\r
 \r
@@ -250,7 +268,7 @@ static void prvSetupHardware( void )
        GPIODirModeSet( GPIO_PORTA_BASE, GPIO_PIN_0 | GPIO_PIN_1, GPIO_DIR_MODE_HW );\r
 \r
        /* Configure the UART for 8-N-1 operation. */\r
-       UARTConfigSet( UART0_BASE, mainBAUD_RATE, UART_CONFIG_WLEN_8 | UART_CONFIG_PAR_NONE | UART_CONFIG_STOP_ONE );\r
+       UARTConfigSetExpClk( UART0_BASE, SysCtlClockGet(), mainBAUD_RATE, UART_CONFIG_WLEN_8 | UART_CONFIG_PAR_NONE | UART_CONFIG_STOP_ONE );\r
 \r
        /* We don't want to use the fifo.  This is for test purposes to generate\r
        as many interrupts as possible. */\r
@@ -258,6 +276,7 @@ static void prvSetupHardware( void )
 \r
        /* Enable Tx interrupts. */\r
        HWREG( UART0_BASE + UART_O_IM ) |= UART_INT_TX;\r
+       IntPrioritySet( INT_UART0, configKERNEL_INTERRUPT_PRIORITY );\r
        IntEnable( INT_UART0 );\r
 \r
 \r
@@ -331,14 +350,14 @@ unsigned portLONG ulStatus;
 \r
 void vGPIO_ISR( void )\r
 {\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
+\r
        /* Clear the interrupt. */\r
        GPIOPinIntClear(GPIO_PORTC_BASE, mainPUSH_BUTTON);\r
 \r
        /* Wake the button handler task. */\r
-       if( xSemaphoreGiveFromISR( xButtonSemaphore, pdFALSE ) )\r
-       {\r
-               portEND_SWITCHING_ISR( pdTRUE );\r
-       }\r
+       xSemaphoreGiveFromISR( xButtonSemaphore, &xHigherPriorityTaskWoken );\r
+       portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r