Merge branch 'main' into pbartell/fix_sorted_event_list

This commit is contained in:
Paul Bartell 2021-03-24 21:14:16 -07:00 committed by GitHub
commit 504bf5f471
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -912,8 +912,8 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
pxNewTCB->pcTaskName[ 0 ] = 0x00; pxNewTCB->pcTaskName[ 0 ] = 0x00;
} }
/* This is used as an array index so must ensure it's not too large. First /* This is used as an array index so must ensure it's not too large. */
* remove the privilege bit if one is present. */ configASSERT( uxPriority < configMAX_PRIORITIES );
if( uxPriority >= ( UBaseType_t ) configMAX_PRIORITIES ) if( uxPriority >= ( UBaseType_t ) configMAX_PRIORITIES )
{ {
uxPriority = ( UBaseType_t ) configMAX_PRIORITIES - ( UBaseType_t ) 1U; uxPriority = ( UBaseType_t ) configMAX_PRIORITIES - ( UBaseType_t ) 1U;
@ -1543,7 +1543,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
UBaseType_t uxCurrentBasePriority, uxPriorityUsedOnEntry; UBaseType_t uxCurrentBasePriority, uxPriorityUsedOnEntry;
BaseType_t xYieldRequired = pdFALSE; BaseType_t xYieldRequired = pdFALSE;
configASSERT( ( uxNewPriority < configMAX_PRIORITIES ) ); configASSERT( uxNewPriority < configMAX_PRIORITIES );
/* Ensure the new priority is valid. */ /* Ensure the new priority is valid. */
if( uxNewPriority >= ( UBaseType_t ) configMAX_PRIORITIES ) if( uxNewPriority >= ( UBaseType_t ) configMAX_PRIORITIES )