From f68ec6d2f227c30072836804e33a0863f9990563 Mon Sep 17 00:00:00 2001
From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Wed, 27 Jul 2011 13:05:23 +0000
Subject: [PATCH] Update the batch file that copies the MicroBlaze code to use
 the MicroBlaze8 directory in place of the standard MicroBlaze directory in
 the FreeRTOS Source directory tree.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1511 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 .../CreateProjectDirectoryStructure.bat              |  4 ++--
 .../RTOSDemoSource/FreeRTOS_Source/list.c            | 12 ------------
 .../RTOSDemoSource/FreeRTOS_Source/queue.c           | 11 ++---------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
index 574fe3a22..4153fd50e 100644
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
@@ -14,7 +14,7 @@ IF EXIST FreeRTOS_Source Goto END
     MD FreeRTOS_Source
     MD FreeRTOS_Source\include    
     MD FreeRTOS_Source\portable\GCC
-    MD FreeRTOS_Source\portable\GCC\MicroBlaze
+    MD FreeRTOS_Source\portable\GCC\MicroBlazeV8
     MD FreeRTOS_Source\portable\MemMang    
     MD Demo_Source
     MD Demo_Source\include
@@ -40,7 +40,7 @@ IF EXIST FreeRTOS_Source Goto END
     copy ..\..\..\..\Source\include\*.* FreeRTOS_Source\include
     
     REM Copy the portable layer files
-    copy ..\..\..\..\Source\portable\GCC\MicroBlaze\*.* FreeRTOS_Source\portable\GCC\MicroBlaze
+    copy ..\..\..\..\Source\portable\GCC\MicroBlazeV8\*.* FreeRTOS_Source\portable\GCC\MicroBlazeV8
     
     REM Copy the basic memory allocation files
     copy ..\..\..\..\Source\portable\MemMang\heap_2.c FreeRTOS_Source\portable\MemMang
diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/list.c b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/list.c
index 04682f2ca..c3ef2a89d 100644
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/list.c
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/list.c
@@ -195,15 +195,3 @@ xList * pxList;
 }
 /*-----------------------------------------------------------*/
 
-void vlistGET_OWNER_OF_NEXT_ENTRY( void *pxTCB, xList *pxList )
-{
-xList * const pxConstList = ( pxList );
-	/* Increment the index to the next item and return the item, ensuring */
-	/* we don't return the marker used at the end of the list.  */
-	( pxConstList )->pxIndex = ( pxConstList )->pxIndex->pxNext;
-	if( ( pxConstList )->pxIndex == ( xListItem * ) &( ( pxConstList )->xListEnd ) )
-	{
-		( pxConstList )->pxIndex = ( pxConstList )->pxIndex->pxNext;
-	}
-	( pxTCB ) = ( pxConstList )->pxIndex->pvOwner;
-}
diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/queue.c b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/queue.c
index a58d6379c..2ae7c7030 100644
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/queue.c
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/FreeRTOS_Source/queue.c
@@ -1529,15 +1529,8 @@ signed portBASE_TYPE xReturn;
 		prvLockQueue( pxQueue );
 		if( pxQueue->uxMessagesWaiting == ( unsigned portBASE_TYPE ) 0U )
 		{
-			/* There is nothing in the queue, block for the specified period,
-			provided the period is not zero.  This guards against the case
-			where the time to wake is set to zero because there are no active
-			timers, but the tick count value also happens to be zero - creating
-			a block time of zero which confuses the logic. */
-			if( 1 )//_RB_if( xTicksToWait != 0U ) //_RB_ This should not be needed as the scheduler is suspended so the tick count cannot increment.
-			{
-				vTaskPlaceOnEventListRestricted( &( pxQueue->xTasksWaitingToReceive ), xTicksToWait );
-			}
+			/* There is nothing in the queue, block for the specified period. */
+			vTaskPlaceOnEventListRestricted( &( pxQueue->xTasksWaitingToReceive ), xTicksToWait );
 		}
 		prvUnlockQueue( pxQueue );
 	}
-- 
2.39.2