From 6369b03bd15f00cc3afbe0f96d4881ec8b1c5c50 Mon Sep 17 00:00:00 2001 From: Joseph Julicher Date: Tue, 18 May 2021 15:17:50 -0700 Subject: [PATCH] fixed additional bit mask test errors --- tasks.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tasks.c b/tasks.c index 4b7c99d15..65b57992e 100644 --- a/tasks.c +++ b/tasks.c @@ -762,7 +762,7 @@ static void prvYieldForTask( TCB_t * pxTCB, if( xTaskPriority <= xLowestPriority ) { #if ( configUSE_CORE_AFFINITY == 1 ) - if( ( pxTCB->uxCoreAffinityMask & ( 1 << x ) ) == 1 ) + if( ( pxTCB->uxCoreAffinityMask & ( 1 << x ) ) != 0 ) #endif { #if ( configUSE_TASK_PREEMPTION_DISABLE == 1 ) @@ -1608,11 +1608,13 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) if( pxCurrentTCBs[ xCoreID ] == NULL ) { pxNewTCB->xTaskRunState = xCoreID; + /* This section of code pins the idle tasks to cores. #if ( configUSE_CORE_AFFINITY == 1 ) { pxNewTCB->uxCoreAffinityMask = ( 1 << xCoreID ); } #endif + */ pxCurrentTCBs[ xCoreID ] = pxNewTCB; break; } @@ -2240,7 +2242,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) { xCoreID = ( BaseType_t ) pxTCB->xTaskRunState; - if( ( uxCoreAffinityMask & ( 1 << xCoreID ) ) != 1 ) + if( ( uxCoreAffinityMask & ( 1 << xCoreID ) ) != 0 ) { prvYieldCore( xCoreID ); }