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

pull/4/head
Richard Barry 17 years ago
parent ac58b5b285
commit 49c84f0d41

@ -197,7 +197,7 @@ unsigned portLONG ulNextWord;
void vEMAC_ISR( void ) void vEMAC_ISR( void )
{ {
portBASE_TYPE xSwitchRequired = pdFALSE; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
unsigned portLONG ulTemp; unsigned portLONG ulTemp;
/* Clear the interrupt. */ /* Clear the interrupt. */
@ -207,13 +207,12 @@ unsigned portLONG ulTemp;
/* Was it an Rx interrupt? */ /* Was it an Rx interrupt? */
if( ulTemp & ETH_INT_RX ) if( ulTemp & ETH_INT_RX )
{ {
xSwitchRequired = pdTRUE; xSemaphoreGiveFromISR( xMACInterruptSemaphore, &xHigherPriorityTaskWoken );
xSemaphoreGiveFromISR( xMACInterruptSemaphore, pdFALSE );
EthernetIntDisable( ETH_BASE, ETH_INT_RX ); EthernetIntDisable( ETH_BASE, ETH_INT_RX );
} }
/* Switch to the uIP task. */ /* Switch to the uIP task. */
portEND_SWITCHING_ISR( xSwitchRequired ); portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/

@ -309,7 +309,7 @@ xOLEDMessage xOLEDMessage;
/* Write the message to the LCD. */ /* Write the message to the LCD. */
strcpy( cMessageForDisplay, pcText ); strcpy( cMessageForDisplay, pcText );
xOLEDMessage.pcMessage = cMessageForDisplay; xOLEDMessage.pcMessage = ( signed portCHAR * ) cMessageForDisplay;
xQueueSend( xOLEDQueue, &xOLEDMessage, portMAX_DELAY ); xQueueSend( xOLEDQueue, &xOLEDMessage, portMAX_DELAY );
} }
} }

Loading…
Cancel
Save