summaryrefslogtreecommitdiff
path: root/Demo/CORTEX_LM3S102_KEIL/main.c
diff options
context:
space:
mode:
authorrichardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>2008-04-12 23:34:13 +0000
committerrichardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>2008-04-12 23:34:13 +0000
commit5864b2ab0af8ee476b0ec085bad901899bc4d63b (patch)
tree3bf6b0efd0e21d7a0974e959e9190bfd0d1faaf1 /Demo/CORTEX_LM3S102_KEIL/main.c
parentea2de2853378baeeef67c2a42e258564bb87a918 (diff)
downloadfreertos-5864b2ab0af8ee476b0ec085bad901899bc4d63b.tar.gz
freertos-5864b2ab0af8ee476b0ec085bad901899bc4d63b.tar.bz2
freertos-5864b2ab0af8ee476b0ec085bad901899bc4d63b.tar.xz
Update to use new xQueueSendFromISR() and xSemaphoreGiveFromISR() function semantics.
git-svn-id: https://freertos.svn.sourceforge.net/svnroot/freertos/trunk@308 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
Diffstat (limited to 'Demo/CORTEX_LM3S102_KEIL/main.c')
-rw-r--r--Demo/CORTEX_LM3S102_KEIL/main.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/Demo/CORTEX_LM3S102_KEIL/main.c b/Demo/CORTEX_LM3S102_KEIL/main.c
index 26c6551e..0f3c7ed6 100644
--- a/Demo/CORTEX_LM3S102_KEIL/main.c
+++ b/Demo/CORTEX_LM3S102_KEIL/main.c
@@ -496,7 +496,7 @@ void vUART_ISR(void)
{
unsigned portLONG ulStatus;
portCHAR cRxedChar;
-portBASE_TYPE xTaskWokenByPost = pdFALSE;
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
/* What caused the interrupt. */
ulStatus = UARTIntStatus( UART0_BASE, pdTRUE );
@@ -513,7 +513,7 @@ portBASE_TYPE xTaskWokenByPost = pdFALSE;
Rxed chars. Posting the character should wake the task that is
blocked on the queue waiting for characters. */
cRxedChar = ( portCHAR ) HWREG( UART0_BASE + UART_O_DR );
- xTaskWokenByPost = xQueueSendFromISR( xCommsQueue, &cRxedChar, xTaskWokenByPost );
+ xQueueSendFromISR( xCommsQueue, &cRxedChar, &xHigherPriorityTaskWoken );
}
}
@@ -531,14 +531,11 @@ portBASE_TYPE xTaskWokenByPost = pdFALSE;
}
}
- if( xTaskWokenByPost )
- {
- /* If a task was woken by the character being received then we force
- a context switch to occur in case the task is of higher priority than
- the currently executing task (i.e. the task that this interrupt
- interrupted.) */
- portEND_SWITCHING_ISR( xTaskWokenByPost );
- }
+ /* If a task was woken by the character being received then we force
+ a context switch to occur in case the task is of higher priority than
+ the currently executing task (i.e. the task that this interrupt
+ interrupted.) */
+ portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );
}
/*-----------------------------------------------------------*/