fixed additional bit mask test errors

pull/325/head
Joseph Julicher 4 years ago
parent 56d94df0a8
commit 6369b03bd1

@ -762,7 +762,7 @@ static void prvYieldForTask( TCB_t * pxTCB,
if( xTaskPriority <= xLowestPriority ) if( xTaskPriority <= xLowestPriority )
{ {
#if ( configUSE_CORE_AFFINITY == 1 ) #if ( configUSE_CORE_AFFINITY == 1 )
if( ( pxTCB->uxCoreAffinityMask & ( 1 << x ) ) == 1 ) if( ( pxTCB->uxCoreAffinityMask & ( 1 << x ) ) != 0 )
#endif #endif
{ {
#if ( configUSE_TASK_PREEMPTION_DISABLE == 1 ) #if ( configUSE_TASK_PREEMPTION_DISABLE == 1 )
@ -1608,11 +1608,13 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
if( pxCurrentTCBs[ xCoreID ] == NULL ) if( pxCurrentTCBs[ xCoreID ] == NULL )
{ {
pxNewTCB->xTaskRunState = xCoreID; pxNewTCB->xTaskRunState = xCoreID;
/* This section of code pins the idle tasks to cores.
#if ( configUSE_CORE_AFFINITY == 1 ) #if ( configUSE_CORE_AFFINITY == 1 )
{ {
pxNewTCB->uxCoreAffinityMask = ( 1 << xCoreID ); pxNewTCB->uxCoreAffinityMask = ( 1 << xCoreID );
} }
#endif #endif
*/
pxCurrentTCBs[ xCoreID ] = pxNewTCB; pxCurrentTCBs[ xCoreID ] = pxNewTCB;
break; break;
} }
@ -2240,7 +2242,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
{ {
xCoreID = ( BaseType_t ) pxTCB->xTaskRunState; xCoreID = ( BaseType_t ) pxTCB->xTaskRunState;
if( ( uxCoreAffinityMask & ( 1 << xCoreID ) ) != 1 ) if( ( uxCoreAffinityMask & ( 1 << xCoreID ) ) != 0 )
{ {
prvYieldCore( xCoreID ); prvYieldCore( xCoreID );
} }

Loading…
Cancel
Save