From 49c84f0d41df4d7fce51eaad3cca99b2b1c0e41d Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Sat, 12 Apr 2008 23:45:58 +0000
Subject: [PATCH] Update to use new xQueueSendFromISR() and
 xSemaphoreGiveFromISR() function semantics.

---
 Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c     | 7 +++----
 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 75142ee8d..fd7b8c6e7 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 4bcbb7c41..3c189f867 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 );
     }
 }