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.

This commit is contained in:
Richard Barry 2011-07-27 13:05:23 +00:00
parent 4154b31454
commit a2a309c263
3 changed files with 4 additions and 23 deletions

View File

@ -14,7 +14,7 @@ IF EXIST FreeRTOS_Source Goto END
MD FreeRTOS_Source MD FreeRTOS_Source
MD FreeRTOS_Source\include MD FreeRTOS_Source\include
MD FreeRTOS_Source\portable\GCC MD FreeRTOS_Source\portable\GCC
MD FreeRTOS_Source\portable\GCC\MicroBlaze MD FreeRTOS_Source\portable\GCC\MicroBlazeV8
MD FreeRTOS_Source\portable\MemMang MD FreeRTOS_Source\portable\MemMang
MD Demo_Source MD Demo_Source
MD Demo_Source\include MD Demo_Source\include
@ -40,7 +40,7 @@ IF EXIST FreeRTOS_Source Goto END
copy ..\..\..\..\Source\include\*.* FreeRTOS_Source\include copy ..\..\..\..\Source\include\*.* FreeRTOS_Source\include
REM Copy the portable layer files 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 REM Copy the basic memory allocation files
copy ..\..\..\..\Source\portable\MemMang\heap_2.c FreeRTOS_Source\portable\MemMang copy ..\..\..\..\Source\portable\MemMang\heap_2.c FreeRTOS_Source\portable\MemMang

View File

@ -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;
}

View File

@ -1529,16 +1529,9 @@ signed portBASE_TYPE xReturn;
prvLockQueue( pxQueue ); prvLockQueue( pxQueue );
if( pxQueue->uxMessagesWaiting == ( unsigned portBASE_TYPE ) 0U ) if( pxQueue->uxMessagesWaiting == ( unsigned portBASE_TYPE ) 0U )
{ {
/* There is nothing in the queue, block for the specified period, /* 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 ); vTaskPlaceOnEventListRestricted( &( pxQueue->xTasksWaitingToReceive ), xTicksToWait );
} }
}
prvUnlockQueue( pxQueue ); prvUnlockQueue( pxQueue );
} }