mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-04-19 21:11:57 -04:00
Merge branch 'main' into fix_port_GCC_IAR32
This commit is contained in:
commit
4977d9b2d2
8
tasks.c
8
tasks.c
|
@ -4698,10 +4698,6 @@ BaseType_t xTaskIncrementTick( void )
|
||||||
TickType_t xItemValue;
|
TickType_t xItemValue;
|
||||||
BaseType_t xSwitchRequired = pdFALSE;
|
BaseType_t xSwitchRequired = pdFALSE;
|
||||||
|
|
||||||
#if ( configUSE_PREEMPTION == 1 ) && ( configNUMBER_OF_CORES > 1 )
|
|
||||||
BaseType_t xYieldRequiredForCore[ configNUMBER_OF_CORES ] = { pdFALSE };
|
|
||||||
#endif /* #if ( configUSE_PREEMPTION == 1 ) && ( configNUMBER_OF_CORES > 1 ) */
|
|
||||||
|
|
||||||
traceENTER_xTaskIncrementTick();
|
traceENTER_xTaskIncrementTick();
|
||||||
|
|
||||||
/* Called by the portable layer each time a tick interrupt occurs.
|
/* Called by the portable layer each time a tick interrupt occurs.
|
||||||
|
@ -4853,7 +4849,7 @@ BaseType_t xTaskIncrementTick( void )
|
||||||
{
|
{
|
||||||
if( listCURRENT_LIST_LENGTH( &( pxReadyTasksLists[ pxCurrentTCBs[ xCoreID ]->uxPriority ] ) ) > 1U )
|
if( listCURRENT_LIST_LENGTH( &( pxReadyTasksLists[ pxCurrentTCBs[ xCoreID ]->uxPriority ] ) ) > 1U )
|
||||||
{
|
{
|
||||||
xYieldRequiredForCore[ xCoreID ] = pdTRUE;
|
xYieldPendings[ xCoreID ] = pdTRUE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -4905,7 +4901,7 @@ BaseType_t xTaskIncrementTick( void )
|
||||||
if( pxCurrentTCBs[ xCoreID ]->xPreemptionDisable == pdFALSE )
|
if( pxCurrentTCBs[ xCoreID ]->xPreemptionDisable == pdFALSE )
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
if( ( xYieldRequiredForCore[ xCoreID ] != pdFALSE ) || ( xYieldPendings[ xCoreID ] != pdFALSE ) )
|
if( xYieldPendings[ xCoreID ] != pdFALSE )
|
||||||
{
|
{
|
||||||
if( xCoreID == xCurrentCoreID )
|
if( xCoreID == xCurrentCoreID )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue