diff options
| author | richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2> | 2008-04-12 23:45:58 +0000 |
|---|---|---|
| committer | richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2> | 2008-04-12 23:45:58 +0000 |
| commit | 92fdc2f50aca1da0dcc25f8e0554b373b2e499de (patch) | |
| tree | a575a97c960a719741fe59b16e7e041330175067 | |
| parent | cd517c4521b96f2096ac4b83614ae5914069098b (diff) | |
| download | freertos-92fdc2f50aca1da0dcc25f8e0554b373b2e499de.tar.gz freertos-92fdc2f50aca1da0dcc25f8e0554b373b2e499de.tar.bz2 freertos-92fdc2f50aca1da0dcc25f8e0554b373b2e499de.tar.xz | |
Update to use new xQueueSendFromISR() and xSemaphoreGiveFromISR() function semantics.
git-svn-id: https://freertos.svn.sourceforge.net/svnroot/freertos/trunk@311 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
| -rw-r--r-- | Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c | 7 | ||||
| -rw-r--r-- | Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c index 75142ee8..fd7b8c6e 100644 --- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c +++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c @@ -197,7 +197,7 @@ unsigned portLONG ulNextWord; void vEMAC_ISR( void )
{
-portBASE_TYPE xSwitchRequired = pdFALSE;
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
unsigned portLONG ulTemp;
/* Clear the interrupt. */
@@ -207,13 +207,12 @@ unsigned portLONG ulTemp; /* Was it an Rx interrupt? */
if( ulTemp & ETH_INT_RX )
{
- xSwitchRequired = pdTRUE;
- xSemaphoreGiveFromISR( xMACInterruptSemaphore, pdFALSE );
+ xSemaphoreGiveFromISR( xMACInterruptSemaphore, &xHigherPriorityTaskWoken );
EthernetIntDisable( ETH_BASE, ETH_INT_RX );
}
/* Switch to the uIP task. */
- portEND_SWITCHING_ISR( xSwitchRequired );
+ portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );
}
/*-----------------------------------------------------------*/
diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c index 4bcbb7c4..3c189f86 100644 --- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c +++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c @@ -309,7 +309,7 @@ xOLEDMessage xOLEDMessage; /* Write the message to the LCD. */
strcpy( cMessageForDisplay, pcText );
- xOLEDMessage.pcMessage = cMessageForDisplay;
+ xOLEDMessage.pcMessage = ( signed portCHAR * ) cMessageForDisplay;
xQueueSend( xOLEDQueue, &xOLEDMessage, portMAX_DELAY );
}
}
|