Просмотр исходного кода

Merge branch 'revert/freertos_same_priority_preemption_disabled' into 'master'

Revert "fix(freertos/idf): Add workaround for same priority preemption in xTaskIncrementTick()"

Closes IDF-8428

See merge request espressif/esp-idf!26732
Sudeep Mohanty 2 лет назад
Родитель
Сommit
ebeea3df60
1 измененных файлов с 1 добавлено и 3 удалено
  1. 1 3
      components/freertos/FreeRTOS-Kernel/tasks.c

+ 1 - 3
components/freertos/FreeRTOS-Kernel/tasks.c

@@ -3349,9 +3349,7 @@ BaseType_t xTaskIncrementTick( void )
                              * 0, we only need to context switch if the unblocked
                              * task can run on core 0 and has a higher priority
                              * than the current task. */
-
-                            /* ">" changed to ">="" due to IDF incompatibility (IDF-8428) */
-                            if( ( taskIS_AFFINITY_COMPATIBLE( 0, pxTCB->xCoreID ) == pdTRUE ) && ( pxTCB->uxPriority >= pxCurrentTCBs[ 0 ]->uxPriority ) )
+                            if( ( taskIS_AFFINITY_COMPATIBLE( 0, pxTCB->xCoreID ) == pdTRUE ) && ( pxTCB->uxPriority > pxCurrentTCBs[ 0 ]->uxPriority ) )
                             {
                                 xSwitchRequired = pdTRUE;
                             }