Update to use new xQueueSendFromISR() and xSemaphoreGiveFromISR() function semantics.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@308 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/CORTEX_LM3S102_GCC/Demo1/main.c b/Demo/CORTEX_LM3S102_GCC/Demo1/main.c
index 6e4ee274e1205eb651abfc52cefa6a0fc28f46bf..e4ddc3f30f96ed274ef43f19861e9aa1ba22dc93 100644 (file)
--- a/Demo/CORTEX_LM3S102_GCC/Demo1/main.c
+++ b/Demo/CORTEX_LM3S102_GCC/Demo1/main.c
@@ -503,7 +503,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
@@ -520,7 +520,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
@@ -538,14 +538,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

diff --git a/Demo/CORTEX_LM3S102_GCC/main.c b/Demo/CORTEX_LM3S102_GCC/main.c
index 6e4ee274e1205eb651abfc52cefa6a0fc28f46bf..e4ddc3f30f96ed274ef43f19861e9aa1ba22dc93 100644 (file)
--- a/Demo/CORTEX_LM3S102_GCC/main.c
+++ b/Demo/CORTEX_LM3S102_GCC/main.c
@@ -503,7 +503,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
@@ -520,7 +520,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
@@ -538,14 +538,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

diff --git a/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c b/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c
index 26c6551e57f823e3d62035f0e6ca4a083280c910..0f3c7ed6fa12453b5a11cff22565fdf3bfe2f5fb 100644 (file)
--- a/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c
+++ b/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c
@@ -496,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
@@ -513,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
@@ -531,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

diff --git a/Demo/CORTEX_LM3S102_KEIL/main.c b/Demo/CORTEX_LM3S102_KEIL/main.c
index 26c6551e57f823e3d62035f0e6ca4a083280c910..0f3c7ed6fa12453b5a11cff22565fdf3bfe2f5fb 100644 (file)
--- a/Demo/CORTEX_LM3S102_KEIL/main.c
+++ b/Demo/CORTEX_LM3S102_KEIL/main.c
@@ -496,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
@@ -513,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
@@ -531,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

diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c b/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c
index bd8619b8a8f77e67e51a16639e06dcced12e11d4..e46aa70b84b80a2a75742145d25f3c4ac3ffa31e 100644 (file)
--- a/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c
+++ b/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c
@@ -504,7 +504,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
@@ -521,7 +521,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
@@ -539,14 +539,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

diff --git a/Demo/CORTEX_LM3S316_IAR/commstest.c b/Demo/CORTEX_LM3S316_IAR/commstest.c
index 32f5dd1cfe0bcba0d1871fe0ce524e38b17714ca..4213be7d50cd678d4e5ed7bddee072268eeff8a1 100644 (file)
--- a/Demo/CORTEX_LM3S316_IAR/commstest.c
+++ b/Demo/CORTEX_LM3S316_IAR/commstest.c
@@ -209,7 +209,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
@@ -226,7 +226,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
@@ -244,14 +244,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

diff --git a/Demo/CORTEX_LM3S811_GCC/main.c b/Demo/CORTEX_LM3S811_GCC/main.c
index fc39bd136d05a7958ee79697a85947ac75682186..5c5810397b540cf3eeaeb4fc28017fe3955a9df3 100644 (file)
--- a/Demo/CORTEX_LM3S811_GCC/main.c
+++ b/Demo/CORTEX_LM3S811_GCC/main.c
@@ -350,14 +350,15 @@ 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
+\r
+       portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/Demo/CORTEX_LM3S811_IAR/main.c b/Demo/CORTEX_LM3S811_IAR/main.c
index 53bdd3382f45b01989cb76e09ae42dd0bcfc8838..4441aa06423ef1fc8e0aba8ebd2804d2e9ed2309 100644 (file)
--- a/Demo/CORTEX_LM3S811_IAR/main.c
+++ b/Demo/CORTEX_LM3S811_IAR/main.c
@@ -350,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

diff --git a/Demo/CORTEX_LM3S811_KEIL/main.c b/Demo/CORTEX_LM3S811_KEIL/main.c
index 0481753f862a4d3e797c260a16de76a2d31f1c3d..0233d9510b7f434f6afc1d24504676268b4c09b8 100644 (file)
--- a/Demo/CORTEX_LM3S811_KEIL/main.c
+++ b/Demo/CORTEX_LM3S811_KEIL/main.c
@@ -352,14 +352,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
+       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