Update the batch file that copies the MicroBlaze code to use the MicroBlaze8 director...

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

diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
index 574fe3a229bea260aea02d17758c4bdd94229b75..4153fd50ee44c9cbf623e26a02eb9a3eddc8a6ee 100644 (file)
--- 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\r
     MD FreeRTOS_Source\include    \r
     MD FreeRTOS_Source\portable\GCC\r
     MD FreeRTOS_Source\r
     MD FreeRTOS_Source\include    \r
     MD FreeRTOS_Source\portable\GCC\r

-    MD FreeRTOS_Source\portable\GCC\MicroBlaze\r
+    MD FreeRTOS_Source\portable\GCC\MicroBlazeV8\r

     MD FreeRTOS_Source\portable\MemMang    \r
     MD Demo_Source\r
     MD Demo_Source\include\r
     MD FreeRTOS_Source\portable\MemMang    \r
     MD Demo_Source\r
     MD Demo_Source\include\r


@@ -40,7 +40,7 @@ IF EXIST FreeRTOS_Source Goto END
     copy ..\..\..\..\Source\include\*.* FreeRTOS_Source\include\r
     \r
     REM Copy the portable layer files\r
     copy ..\..\..\..\Source\include\*.* FreeRTOS_Source\include\r
     \r
     REM Copy the portable layer files\r

-    copy ..\..\..\..\Source\portable\GCC\MicroBlaze\*.* FreeRTOS_Source\portable\GCC\MicroBlaze\r
+    copy ..\..\..\..\Source\portable\GCC\MicroBlazeV8\*.* FreeRTOS_Source\portable\GCC\MicroBlazeV8\r

     \r
     REM Copy the basic memory allocation files\r
     copy ..\..\..\..\Source\portable\MemMang\heap_2.c FreeRTOS_Source\portable\MemMang\r
     \r
     REM Copy the basic memory allocation files\r
     copy ..\..\..\..\Source\portable\MemMang\heap_2.c FreeRTOS_Source\portable\MemMang\r

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 04682f2ca987b417ebe0cab72ef4e072186a72a9..c3ef2a89dd717defcc730c4d1d94a9187600db33 100644 (file)
--- 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;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

-void vlistGET_OWNER_OF_NEXT_ENTRY( void *pxTCB, xList *pxList )\r
-{\r
-xList * const pxConstList = ( pxList );\r
-       /* Increment the index to the next item and return the item, ensuring */\r
-       /* we don't return the marker used at the end of the list.  */\r
-       ( pxConstList )->pxIndex = ( pxConstList )->pxIndex->pxNext;\r
-       if( ( pxConstList )->pxIndex == ( xListItem * ) &( ( pxConstList )->xListEnd ) )\r
-       {\r
-               ( pxConstList )->pxIndex = ( pxConstList )->pxIndex->pxNext;\r
-       }\r
-       ( pxTCB ) = ( pxConstList )->pxIndex->pvOwner;\r
-}\r

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 a58d6379c661839100ff2991b1d58490477c110e..2ae7c7030d709346aaca69cd83296bcd0b1ed95f 100644 (file)
--- 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 );\r
                if( pxQueue->uxMessagesWaiting == ( unsigned portBASE_TYPE ) 0U )\r
                {\r
                prvLockQueue( pxQueue );\r
                if( pxQueue->uxMessagesWaiting == ( unsigned portBASE_TYPE ) 0U )\r
                {\r

-                       /* There is nothing in the queue, block for the specified period,\r
-                       provided the period is not zero.  This guards against the case\r
-                       where the time to wake is set to zero because there are no active\r
-                       timers, but the tick count value also happens to be zero - creating\r
-                       a block time of zero which confuses the logic. */\r
-                       if( 1 )//_RB_if( xTicksToWait != 0U ) //_RB_ This should not be needed as the scheduler is suspended so the tick count cannot increment.\r
-                       {\r
-                               vTaskPlaceOnEventListRestricted( &( pxQueue->xTasksWaitingToReceive ), xTicksToWait );\r
-                       }\r
+                       /* There is nothing in the queue, block for the specified period. */\r
+                       vTaskPlaceOnEventListRestricted( &( pxQueue->xTasksWaitingToReceive ), xTicksToWait );\r

                }\r
                prvUnlockQueue( pxQueue );\r
        }\r
                }\r
                prvUnlockQueue( pxQueue );\r
        }\r