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

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

diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c
index 75142ee8de312fbc177be37b6a2680a89df65f71..fd7b8c6e7726e4431d4f64376e2a00b79c08cdc5 100644 (file)
--- 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;
 \r
 void vEMAC_ISR( void )\r
 {\r
-portBASE_TYPE xSwitchRequired = pdFALSE;\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 unsigned portLONG ulTemp;\r
 \r
        /* Clear the interrupt. */\r
@@ -207,13 +207,12 @@ unsigned portLONG ulTemp;
        /* Was it an Rx interrupt? */\r
        if( ulTemp & ETH_INT_RX )\r
        {\r
-               xSwitchRequired = pdTRUE;\r
-               xSemaphoreGiveFromISR( xMACInterruptSemaphore, pdFALSE );\r
+               xSemaphoreGiveFromISR( xMACInterruptSemaphore, &xHigherPriorityTaskWoken );\r
                EthernetIntDisable( ETH_BASE, ETH_INT_RX );\r
        }\r
                \r
     /* Switch to the uIP task. */\r
-       portEND_SWITCHING_ISR( xSwitchRequired );\r
+       portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c
index 4bcbb7c41cbfb113cadbf8eea7c6702a4ed3e4d5..3c189f867b389beb3af50189cf7485935e255794 100644 (file)
--- 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;
 \r
         /* Write the message to the LCD. */\r
                strcpy( cMessageForDisplay, pcText );\r
-               xOLEDMessage.pcMessage = cMessageForDisplay;\r
+               xOLEDMessage.pcMessage = ( signed portCHAR * ) cMessageForDisplay;\r
         xQueueSend( xOLEDQueue, &xOLEDMessage, portMAX_DELAY );\r
     }\r
 }\r