Compare commits

..

No commits in common. "3d44975181723262f6265c777e7579377306d41a" and "44ae6cf61a7dc8c5801afdd9c562adcbef7f5070" have entirely different histories.

2 changed files with 2 additions and 4 deletions

View file

@ -229,7 +229,6 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
/* Ensure that there is enough space to store Thread_t on the stack. */ /* Ensure that there is enough space to store Thread_t on the stack. */
ulStackSize = ( size_t ) ( pxTopOfStack + 1 - pxEndOfStack ) * sizeof( *pxTopOfStack ); ulStackSize = ( size_t ) ( pxTopOfStack + 1 - pxEndOfStack ) * sizeof( *pxTopOfStack );
configASSERT( ulStackSize > sizeof( Thread_t ) ); configASSERT( ulStackSize > sizeof( Thread_t ) );
( void ) ulStackSize; /* suppress set but not used warning */
thread->pxCode = pxCode; thread->pxCode = pxCode;
thread->pvParams = pvParameters; thread->pvParams = pvParameters;

View file

@ -227,7 +227,7 @@ static inline void vPortRecursiveLock( BaseType_t xCoreID,
if( ucOwnedByCore[ xCoreID ][ ulLockNum ] ) if( ucOwnedByCore[ xCoreID ][ ulLockNum ] )
{ {
configASSERT( ucRecursionCountByLock[ ulLockNum ] != 255u ); configASSERT( ucRecursionCountByLock[ ulLockNum ] != 255u );
ucRecursionCountByLock[ ulLockNum ] = ucRecursionCountByLock[ ulLockNum ] + 1; ucRecursionCountByLock[ ulLockNum ]++;
return; return;
} }
spin_lock_unsafe_blocking(pxSpinLock); spin_lock_unsafe_blocking(pxSpinLock);
@ -241,8 +241,7 @@ static inline void vPortRecursiveLock( BaseType_t xCoreID,
configASSERT( ( ucOwnedByCore[ xCoreID ] [ulLockNum ] ) != 0 ); configASSERT( ( ucOwnedByCore[ xCoreID ] [ulLockNum ] ) != 0 );
configASSERT( ucRecursionCountByLock[ ulLockNum ] != 0 ); configASSERT( ucRecursionCountByLock[ ulLockNum ] != 0 );
ucRecursionCountByLock[ ulLockNum ] = ucRecursionCountByLock[ ulLockNum ] - 1; if( !--ucRecursionCountByLock[ ulLockNum ] )
if ( ucRecursionCountByLock[ ulLockNum ] == 0U )
{ {
ucOwnedByCore[ xCoreID ] [ ulLockNum ] = 0; ucOwnedByCore[ xCoreID ] [ ulLockNum ] = 0;
spin_unlock_unsafe(pxSpinLock); spin_unlock_unsafe(pxSpinLock);