From 41080613169150ae9e995effeae6821e5c49a146 Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Mon, 20 Jun 2011 19:40:50 +0000
Subject: [PATCH] Complete the new comtest_strings.c file. Somewhat optimise
 the calling of vTaskSwitchContext() from interrupts in the new MicroBlaze
 port to ensure it does not get called multiple times when more than one
 peripheral is called from the same interrupt.

---
 .../SDKProjects/RTOSDemoSource/.cproject      |   5 +-
 .../Demo_Source/comtest_strings.c             | 210 ++++++++++--------
 .../portable/GCC/MicroBlaze/port.c            |  51 +----
 .../portable/GCC/MicroBlaze/portasm.S         |  20 ++
 .../portable/GCC/MicroBlaze/portmacro.h       |   3 +-
 .../SDKProjects/RTOSDemoSource/serial.c       |   2 +-
 6 files changed, 155 insertions(+), 136 deletions(-)

diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject
index ef8563efb..5aace26d5 100644
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject
@@ -74,6 +74,7 @@
 									<listOptionValue builtIn="false" value="../../RTOSDemoBSP/microblaze_0/lib"/>
 								</option>
 								<option id="xilinx.gnu.c.linker.option.lscript.176750025" name="Linker Script" superClass="xilinx.gnu.c.linker.option.lscript" value="../src/lscript.ld" valueType="string"/>
+								<option id="xilinx.gnu.c.link.option.ldflags.1590675094" superClass="xilinx.gnu.c.link.option.ldflags" value="" valueType="string"/>
 								<inputType id="xilinx.gnu.linker.input.384537517" superClass="xilinx.gnu.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -92,6 +93,7 @@
 									<listOptionValue builtIn="false" value="../../RTOSDemoBSP/microblaze_0/lib"/>
 								</option>
 								<option id="xilinx.gnu.c.linker.option.lscript.664782973" name="Linker Script" superClass="xilinx.gnu.c.linker.option.lscript" value="../src/lscript.ld" valueType="string"/>
+								<option id="xilinx.gnu.c.link.option.ldflags.1516959028" superClass="xilinx.gnu.c.link.option.ldflags" value="" valueType="string"/>
 							</tool>
 							<tool id="xilinx.gnu.mb.size.debug.778946449" name="MicroBlaze Print Size" superClass="xilinx.gnu.mb.size.debug"/>
 							<tool id="xilinx.elfcheck.mb.debug.225695907" name="Xilinx ELF Check" superClass="xilinx.elfcheck.mb.debug">
@@ -1044,7 +1046,7 @@
 									<listOptionValue builtIn="false" value="../../RTOSDemoBSP/microblaze_0/lib"/>
 								</option>
 								<option id="xilinx.gnu.c.linker.option.lscript.1073578867" name="Linker Script" superClass="xilinx.gnu.c.linker.option.lscript" value="../src/lscript.ld" valueType="string"/>
-								<option id="xilinx.gnu.c.link.option.ldflags.471396681" name="Linker Flags" superClass="xilinx.gnu.c.link.option.ldflags" value="-Map=output.map" valueType="string"/>
+								<option id="xilinx.gnu.c.link.option.ldflags.471396681" name="Linker Flags" superClass="xilinx.gnu.c.link.option.ldflags" value="" valueType="string"/>
 								<option id="xilinx.gnu.c.link.option.other.791541632" name="Other options (-XLinker [option])" superClass="xilinx.gnu.c.link.option.other"/>
 								<inputType id="xilinx.gnu.linker.input.1399699093" superClass="xilinx.gnu.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -1064,6 +1066,7 @@
 									<listOptionValue builtIn="false" value="../../RTOSDemoBSP/microblaze_0/lib"/>
 								</option>
 								<option id="xilinx.gnu.c.linker.option.lscript.480905448" name="Linker Script" superClass="xilinx.gnu.c.linker.option.lscript" value="../src/lscript.ld" valueType="string"/>
+								<option id="xilinx.gnu.c.link.option.ldflags.548655668" superClass="xilinx.gnu.c.link.option.ldflags" value="" valueType="string"/>
 							</tool>
 							<tool id="xilinx.gnu.mb.size.debug.536351174" name="MicroBlaze Print Size" superClass="xilinx.gnu.mb.size.debug"/>
 							<tool id="xilinx.elfcheck.mb.debug.1281142255" name="Xilinx ELF Check" superClass="xilinx.elfcheck.mb.debug">
diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/Demo_Source/comtest_strings.c b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/Demo_Source/comtest_strings.c
index c1354e986..e5746e298 100644
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/Demo_Source/comtest_strings.c
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/Demo_Source/comtest_strings.c
@@ -53,33 +53,26 @@
 
 
 /*
- * This version of comtest. c is for use on systems that have limited stack
- * space and no display facilities.  The complete version can be found in
- * the Demo/Common/Full directory.
+ * Creates a task and a timer that operate on an interrupt driven serial port.
+ * This demo assumes that the characters transmitted on a port will also be
+ * received on the same port.  Therefore, the UART must either be connected to
+ * an echo server, or the uart connector must have a loopback connector fitted.
+ * See http://www.serialporttool.com/CommEcho.htm for a suitable echo server
+ * for Windows hosts.
  *
- * Creates two tasks that operate on an interrupt driven serial port.  A
- * loopback connector should be used so that everything that is transmitted is
- * also received.  The serial port does not use any flow control.  On a
- * standard 9way 'D' connector pins two and three should be connected together.
+ * The timer sends a string to the UART, toggles an LED, then waits resets
+ * itself by changing its own period.  The period is calculated as a pseudo
+ * random number between comTX_MAX_BLOCK_TIME and comTX_MIN_BLOCK_TIME.
  *
- * The first task posts a sequence of characters to the Tx queue, toggling an
- * LED on each successful post.  At the end of the sequence it sleeps for a
- * pseudo-random period before resending the same sequence.
+ * The task blocks on an Rx queue waiting for a character to become
+ * available.  Received characters are checked to ensure they match those
+ * transmitted by the Tx timer.  An error is latched if characters are missing,
+ * incorrect, or arrive too slowly.
  *
- * The UART Tx end interrupt is enabled whenever data is available in the Tx
- * queue.  The Tx end ISR removes a single character from the Tx queue and
- * passes it to the UART for transmission.
- *
- * The second task blocks on the Rx queue waiting for a character to become
- * available.  When the UART Rx end interrupt receives a character it places
- * it in the Rx queue, waking the second task.  The second task checks that the
- * characters removed from the Rx queue form the same sequence as those posted
- * to the Tx queue, and toggles an LED for each correct character.
- *
- * The receiving task is spawned with a higher priority than the transmitting
- * task.  The receiver will therefore wake every time a character is
- * transmitted so neither the Tx or Rx queue should ever hold more than a few
- * characters.
+ * How characters are actually transmitted and received is port specific.  Demos
+ * that include this test/demo file will provide example drivers.  The Tx timer
+ * executes in the context of the timer service (daemon) task, and must therefore
+ * never attempt to block.
  *
  */
 
@@ -88,128 +81,154 @@
 #include <string.h>
 #include "FreeRTOS.h"
 #include "task.h"
+#include "timers.h"
+
+#ifndef configUSE_TIMERS
+	#error This demo uses timers.  configUSE_TIMERS must be set to 1 in FreeRTOSConfig.h.
+#endif
+
+#if configUSE_TIMERS != 1
+	#error This demo uses timers.  configUSE_TIMERS must be set to 1 in FreeRTOSConfig.h.
+#endif
+
 
 /* Demo program include files. */
 #include "serial.h"
 #include "comtest_strings.h"
 #include "partest.h"
 
+/* The size of the stack given to the Rx task. */
 #define comSTACK_SIZE				configMINIMAL_STACK_SIZE
+
+/* See the comment above the declaraction of uxBaseLED. */
 #define comTX_LED_OFFSET			( 0 )
 #define comRX_LED_OFFSET			( 1 )
-#define comTOTAL_PERMISSIBLE_ERRORS ( 2 )
 
-/* The Tx task will transmit the sequence of characters at a pseudo random
-interval.  This is the maximum and minimum block time between sends. */
+/* The Tx timer transmits the sequence of characters at a pseudo random
+interval that is capped between comTX_MAX_BLOCK_TIME and
+comTX_MIN_BLOCK_TIME. */
 #define comTX_MAX_BLOCK_TIME		( ( portTickType ) 0x96 )
 #define comTX_MIN_BLOCK_TIME		( ( portTickType ) 0x32 )
 #define comOFFSET_TIME				( ( portTickType ) 3 )
 
-/* We should find that each character can be queued for Tx immediately and we
-don't have to block to send. */
-#define comNO_BLOCK					( ( portTickType ) 0 )
+/* States for the simple state machine implemented in the Rx task. */
+#define comtstWAITING_START_OF_STRING 	0
+#define comtstWAITING_END_OF_STRING		1
 
-/* The Rx task will block on the Rx queue for a long period. */
-#define comRX_BLOCK_TIME			( ( portTickType ) 0xffff )
+/* A short delay in ticks - this delay is used to allow the Rx queue to fill up
+a bit so more than one character can be processed at a time.  This is relative
+to comTX_MIN_BLOCK_TIME to ensure it is never longer than the shortest gap
+between transmissions.  It could be worked out more scientifically from the
+baud rate being used. */
+#define comSHORT_DELAY				( comTX_MIN_BLOCK_TIME >> ( portTickType ) 2 )
 
 /* The string that is transmitted and received. */
-#define comTRANSACTED_STRING		"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-
-#define comBUFFER_LEN				( ( unsigned portBASE_TYPE ) ( comLAST_BYTE - comFIRST_BYTE ) + ( unsigned portBASE_TYPE ) 1 )
-#define comINITIAL_RX_COUNT_VALUE	( 0 )
+#define comTRANSACTED_STRING		"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
 
 /* Handle to the com port used by both tasks. */
 static xComPortHandle xPort = NULL;
 
-/* The transmit task as described at the top of the file. */
-static void vComTxTask( void *pvParameters );
+/* The transmit timer as described at the top of the file. */
+static void vComTxTimerCallback( xTimerHandle xTimer );
 
 /* The receive task as described at the top of the file. */
-static portTASK_FUNCTION_PROTO( vComRxTask, pvParameters );
+static void vComRxTask( void *pvParameters );
 
-/* The LED that should be toggled by the Rx and Tx tasks.  The Rx task will
-toggle LED ( uxBaseLED + comRX_LED_OFFSET).  The Tx task will toggle LED
-( uxBaseLED + comTX_LED_OFFSET ). */
+/* The Rx task will toggle LED ( uxBaseLED + comRX_LED_OFFSET).  The Tx task
+will toggle LED ( uxBaseLED + comTX_LED_OFFSET ). */
 static unsigned portBASE_TYPE uxBaseLED = 0;
 
-/* Check variable used to ensure no error have occurred.  The Rx task will
-increment this variable after every successfully received sequence.  If at any
-time the sequence is incorrect the the variable will stop being incremented. */
-static volatile unsigned portBASE_TYPE uxRxLoops = comINITIAL_RX_COUNT_VALUE;
+/* The Rx task toggles uxRxLoops on each successful iteration of its defined
+function - provided no errors have ever been latched.  If this variable stops
+incrementing, then an error has occurred. */
+static volatile unsigned portBASE_TYPE uxRxLoops = 0UL;
+
+/* The timer used to periodically transmit the string. */
+static xTimerHandle xTxTimer = NULL;
+
+/* The string length is held at file scope so the Tx timer does not need to
+calculate it each time it executes. */
+static size_t xStringLength = 0U;
 
 /*-----------------------------------------------------------*/
 
 void vStartComTestStringsTasks( unsigned portBASE_TYPE uxPriority, unsigned long ulBaudRate, unsigned portBASE_TYPE uxLED )
 {
-	/* Initialise the com port then spawn the Rx and Tx tasks. */
+	/* Store values that are used at run time. */
 	uxBaseLED = uxLED;
-	xSerialPortInitMinimal( ulBaudRate, strlen( comTRANSACTED_STRING ) );
 
-	/* The Tx task is spawned with a lower priority than the Rx task. */
-	xTaskCreate( vComTxTask, ( signed char * ) "COMTx", comSTACK_SIZE, NULL, uxPriority - 1, ( xTaskHandle * ) NULL );
+	/* Calculate the string length here, rather than each time the timer
+	executes. */
+	xStringLength = strlen( comTRANSACTED_STRING );
+
+	/* Include the null terminator in the string length as this is used to
+	detect the end of the string in the Rx task. */
+	xStringLength++;
+
+	/* Initialise the com port then spawn the Rx task and create the Tx
+	timer. */
+	xSerialPortInitMinimal( ulBaudRate, ( xStringLength * 2U ) );
+
+	/* Create the Rx task and the Tx timer.  The timer is started from the
+	Rx task. */
 	xTaskCreate( vComRxTask, ( signed char * ) "COMRx", comSTACK_SIZE, NULL, uxPriority, ( xTaskHandle * ) NULL );
+	xTxTimer = xTimerCreate( ( const signed char * ) "TxTimer", comTX_MIN_BLOCK_TIME, pdFALSE, NULL, vComTxTimerCallback );
+	configASSERT( xTxTimer );
 }
 /*-----------------------------------------------------------*/
 
-static void vComTxTask( void * pvParameters )
+static void vComTxTimerCallback( xTimerHandle xTimer )
 {
 portTickType xTimeToWait;
-size_t xStringLength;
 
 	/* Just to stop compiler warnings. */
-	( void ) pvParameters;
+	( void ) xTimer;
 
-	xStringLength = strlen( comTRANSACTED_STRING );
+	/* Send the string.  How this is actually performed depends on the
+	sample driver provided with this demo.  However - as this is a timer,
+	it executes in the context of the timer task and therefore must not
+	block. */
+	vSerialPutString( xPort, ( const signed char * const ) comTRANSACTED_STRING, xStringLength );
 
-	/* Include the null terminator in the string length. */
-	xStringLength++;
+	/* Toggle an LED to give a visible indication that another transmission
+	has been performed. */
+	vParTestToggleLED( uxBaseLED + comTX_LED_OFFSET );
 
-	for( ;; )
-	{
-		/* Send the string.  Setting the last parameter to pdTRUE ensures
-		that vSerialPutString() will not return until the entire string has
-		been sent to the UART.  The UART interrupt is used to send more data
-		to the UART as the UART FIFO empties, until the entire string has been
-		sent.  No CPU time is consumed by this task while it waits for the
-		string to be sent to the UART. */
-		vSerialPutString( xPort, ( const signed char * const ) comTRANSACTED_STRING, xStringLength );
-
-		/* Toggle an LED to give a visible indication that another transmission
-		has been performed. */
-		vParTestToggleLED( uxBaseLED + comTX_LED_OFFSET );
-
-		/* Wait a pseudo random time before sending the string again. */
-		xTimeToWait = xTaskGetTickCount() + comOFFSET_TIME;
-
-		/* Ensure the time to wait does not greater than comTX_MAX_BLOCK_TIME. */
-		xTimeToWait %= comTX_MAX_BLOCK_TIME;
-
-		/* Ensure the time to wait is not less than comTX_MIN_BLOCK_TIME. */
-		if( xTimeToWait < comTX_MIN_BLOCK_TIME )
-		{
-			xTimeToWait = comTX_MIN_BLOCK_TIME;
-		}
+	/* Wait a pseudo random time before sending the string again. */
+	xTimeToWait = xTaskGetTickCount() + comOFFSET_TIME;
+
+	/* Ensure the time to wait does not greater than comTX_MAX_BLOCK_TIME. */
+	xTimeToWait %= comTX_MAX_BLOCK_TIME;
 
-		vTaskDelay( xTimeToWait );
+	/* Ensure the time to wait is not less than comTX_MIN_BLOCK_TIME. */
+	if( xTimeToWait < comTX_MIN_BLOCK_TIME )
+	{
+		xTimeToWait = comTX_MIN_BLOCK_TIME;
 	}
+
+	/* Reset the timer to run again xTimeToWait ticks from now.  This function
+	is called from the context of the timer task, so the block time must not
+	be anything other than zero. */
+	xTimerChangePeriod( xTxTimer, xTimeToWait, 0 );
 }
 /*-----------------------------------------------------------*/
 
-#define comtstWAITING_START_OF_STRING 	0
-#define comtstWAITING_END_OF_STRING		1
-
-
 static void vComRxTask( void *pvParameters )
 {
 portBASE_TYPE xState = comtstWAITING_START_OF_STRING, xErrorOccurred = pdFALSE;
-char *pcExpectedByte, cRxedChar;
+signed char *pcExpectedByte, cRxedChar;
 const xComPortHandle xPort = NULL;
 
-
 	/* Just to stop compiler warnings. */
 	( void ) pvParameters;
 
-	pcExpectedByte = comTRANSACTED_STRING;
+	/* Start the Tx timer.  This only needs to be started once, as it will
+	reset itself thereafter. */
+	xTimerStart( xTxTimer, portMAX_DELAY );
+
+	/* The first expected Rx character is the first in the string that is
+	transmitted. */
+	pcExpectedByte = ( signed char * ) comTRANSACTED_STRING;
 
 	for( ;; )
 	{
@@ -232,10 +251,17 @@ const xComPortHandle xPort = NULL;
 					as it comes in until the entire string has been received. */
 					xState = comtstWAITING_END_OF_STRING;
 					pcExpectedByte++;
+
+					/* Block for a short period.  This just allows the Rx queue to
+					contain more than one character, and therefore prevent
+					thrashing reads to the queue and repetitive context switches as
+					each character is received. */
+					vTaskDelay( comSHORT_DELAY );
 				}
 				break;
 
 			case comtstWAITING_END_OF_STRING:
+
 				if( cRxedChar == *pcExpectedByte )
 				{
 					/* The received character was the expected character.  Was
@@ -256,7 +282,7 @@ const xComPortHandle xPort = NULL;
 						}
 
 						/* Go back to wait for the start of the next string. */
-						pcExpectedByte = comTRANSACTED_STRING;
+						pcExpectedByte = ( signed char * ) comTRANSACTED_STRING;
 						xState = comtstWAITING_START_OF_STRING;
 					}
 					else
@@ -289,7 +315,7 @@ portBASE_TYPE xReturn;
 	/* If the count of successful reception loops has not changed than at
 	some time an error occurred (i.e. a character was received out of sequence)
 	and we will return false. */
-	if( uxRxLoops == comINITIAL_RX_COUNT_VALUE )
+	if( uxRxLoops == 0UL )
 	{
 		xReturn = pdFALSE;
 	}
@@ -300,7 +326,7 @@ portBASE_TYPE xReturn;
 
 	/* Reset the count of successful Rx loops.  When this function is called
 	again it should have been incremented. */
-	uxRxLoops = comINITIAL_RX_COUNT_VALUE;
+	uxRxLoops = 0UL;
 
 	return xReturn;
 }
diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/port.c b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/port.c
index 11dc1aedc..b93bcc2fa 100644
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/port.c
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/port.c
@@ -104,6 +104,13 @@ volatile unsigned portBASE_TYPE uxCriticalNesting = portINITIAL_NESTING_VALUE;
 separate stack for interrupts. */
 unsigned long *pulISRStack;
 
+/* If an interrupt requests a context switch then ulTaskSwitchRequested will
+get set to 1, which in turn will cause vTaskSwitchContext() to be called
+prior to a task context getting restored on exit from the interrupt.  This
+mechanism is used as a single interrupt can cause multiple peripherals handlers
+to get called, and vTaskSwitchContext() should not get called in each handler. */
+volatile unsigned long ulTaskSwitchRequested = 0UL;
+
 /* The instance of the interrupt controller used by this port. */
 static XIntc xInterruptControllerInstance;
 
@@ -276,45 +283,6 @@ extern void VPortYieldASM( void );
 }
 /*-----------------------------------------------------------*/
 
-/*
- * The task context has already been saved when this is called.
- *
- * This handler determines the interrupt source and calls the relevant 
- * peripheral handler.
- */
-void vTaskISRHandler( void )
-{
-static unsigned long ulPending;    
-static XIntc_VectorTableEntry *pxTablePtr;
-static XIntc_Config *pxConfig;
-static unsigned long ulInterruptMask;
-
-	/* Which interrupts are pending? */
-	ulPending = XIntc_In32( ( XPAR_INTC_SINGLE_BASEADDR + XIN_IVR_OFFSET ) );
-
-	if( ulPending < XPAR_INTC_MAX_NUM_INTR_INPUTS )
-	{
-
-		ulInterruptMask = ( unsigned long ) 1 << ulPending;
-
-		/* Get the configuration data using the device ID */
-		pxConfig = &XIntc_ConfigTable[ ( unsigned long ) XPAR_INTC_SINGLE_DEVICE_ID ];
-
-		pxTablePtr = &( pxConfig->HandlerTable[ ulPending ] );
-		if( pxConfig->AckBeforeService & ( ulInterruptMask  ) )
-		{
-			XIntc_AckIntr( pxConfig->BaseAddress, ulInterruptMask );
-			pxTablePtr->Handler( pxTablePtr->CallBackRef );
-		}
-		else
-		{
-			pxTablePtr->Handler( pxTablePtr->CallBackRef );
-			XIntc_AckIntr( pxConfig->BaseAddress, ulInterruptMask );
-		}
-	}
-}
-/*-----------------------------------------------------------*/
-
 void vPortEnableInterrupt( unsigned char ucInterruptID )
 {
 	XIntc_Enable( &xInterruptControllerInstance, ucInterruptID );
@@ -357,7 +325,7 @@ portBASE_TYPE xReturn = XST_SUCCESS;
  */
 void vTickISR( void *pvUnused )
 {
-extern void vApplicationClearTimerInterrupt();
+extern void vApplicationClearTimerInterrupt( void );
 
 	/* Ensure the unused parameter does not generate a compiler warning. */
 	( void ) pvUnused;
@@ -370,7 +338,8 @@ extern void vApplicationClearTimerInterrupt();
 	/* If we are using the preemptive scheduler then we also need to determine
 	if this tick should cause a context switch. */
 	#if configUSE_PREEMPTION == 1
-		vTaskSwitchContext();
+		/* Force vTaskSwitchContext() to be called as the interrupt exits. */
+		ulTaskSwitchRequested = 1;
 	#endif
 }
 /*-----------------------------------------------------------*/
diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/portasm.S b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/portasm.S
index 2621c6ead..a3852a6cb 100644
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/portasm.S
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/portasm.S
@@ -108,6 +108,7 @@ back into the caller stack. */
 	.extern vTaskSwitchContext
 	.extern uxCriticalNesting
 	.extern pulISRStack
+	.extern ulTaskSwitchRequested
 
 	.global _interrupt_handler
 	.global VPortYieldASM
@@ -282,6 +283,25 @@ _interrupt_handler:
 	bralid r15, XIntc_DeviceInterruptHandler
 	or r0, r0, r0
 
+	/* See if a new task should be selected to execute. */
+	lwi r18, r0, ulTaskSwitchRequested
+	or r18, r18, r0
+
+	/* If ulTaskSwitchRequested is already zero, then jump straight to
+	restoring the task that is already in the Running state. */
+	beqi r18, task_switch_not_requested
+
+	/* Set ulTaskSwitchRequested back to zero as a task switch is about to be
+	performed. */
+	swi r0, r0, ulTaskSwitchRequested
+
+	/* ulTaskSwitchRequested was not 0 when tested.  Select the next task to
+	execute. */
+	bralid r15, vTaskSwitchContext
+	or r0, r0, r0
+
+task_switch_not_requested:
+
 	/* Restore the context of the next task scheduled to execute. */
 	portRESTORE_CONTEXT
 
diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/portmacro.h b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/portmacro.h
index 15d9a0202..40f05e4ea 100644
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/portmacro.h
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/portable/GCC/MicroBlaze/portmacro.h
@@ -130,7 +130,8 @@ void vPortYield( void );
 #define portYIELD() vPortYield()
 
 void vTaskSwitchContext();
-#define portYIELD_FROM_ISR( x ) if( x != pdFALSE ) vTaskSwitchContext() //_RB_ This needs re-implementing so it does not get called multiple times as multiple peripherals are servied in a single ISR. */
+extern volatile unsigned long ulTaskSwitchRequested;
+#define portYIELD_FROM_ISR( x ) if( x != pdFALSE ) ulTaskSwitchRequested = 1
 /*-----------------------------------------------------------*/
 
 /* Hardware specifics. */
diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/serial.c b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/serial.c
index 605da484a..fc67d9b0f 100644
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/serial.c
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/serial.c
@@ -175,7 +175,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 		xQueueSendFromISR( xRxedChars, &cRxedChar, &xHigherPriorityTaskWoken );
 	}
 
-	portYIELD_FROM_ISR( xHigherPriorityTaskWoken ); //_RB_ This needs re-implementing so it does not get called multiple times as multiple peripherals are servied in a single ISR. */
+	portYIELD_FROM_ISR( xHigherPriorityTaskWoken );
 }
 /*-----------------------------------------------------------*/