|
|
@ -2382,8 +2382,10 @@ tskTCB *pxNewTCB;
|
|
|
|
{
|
|
|
|
{
|
|
|
|
tskTCB * const pxTCB = ( tskTCB * ) pxMutexHolder;
|
|
|
|
tskTCB * const pxTCB = ( tskTCB * ) pxMutexHolder;
|
|
|
|
|
|
|
|
|
|
|
|
configASSERT( pxMutexHolder );
|
|
|
|
/* If the mutex was given back by an interrupt while the queue was
|
|
|
|
|
|
|
|
locked then the mutex holder might now be NULL. */
|
|
|
|
|
|
|
|
if( pxMutexHolder != NULL )
|
|
|
|
|
|
|
|
{
|
|
|
|
if( pxTCB->uxPriority < pxCurrentTCB->uxPriority )
|
|
|
|
if( pxTCB->uxPriority < pxCurrentTCB->uxPriority )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
/* Adjust the mutex holder state to account for its new priority. */
|
|
|
|
/* Adjust the mutex holder state to account for its new priority. */
|
|
|
@ -2408,6 +2410,7 @@ tskTCB *pxNewTCB;
|
|
|
|
traceTASK_PRIORITY_INHERIT( pxTCB, pxCurrentTCB->uxPriority );
|
|
|
|
traceTASK_PRIORITY_INHERIT( pxTCB, pxCurrentTCB->uxPriority );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
/*-----------------------------------------------------------*/
|
|
|
|
/*-----------------------------------------------------------*/
|
|
|
|