Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix prev code to not crash horribly when scheduler is not running yet

Browse source
This commit is contained in:
Jeroen Domburg 2016-09-05 11:58:40 +08:00 committed by Ivan Grokhotkov
parent 08ec33c6a2
commit 128bb77c5a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/freertos/tasks.c
View file

@ -3761,7 +3761,10 @@ scheduler will re-enable the interrupts instead. */
void vTaskEnterCritical( portMUX_TYPE *mux ) void vTaskEnterCritical( portMUX_TYPE *mux )
#endif #endif
{ {
portENTER_CRITICAL_NESTED(uxOldInterruptState); if( xSchedulerRunning != pdFALSE )
{
portENTER_CRITICAL_NESTED(pxCurrentTCB[ xPortGetCoreID() ]->uxOldInterruptState);
}
#ifdef CONFIG_FREERTOS_PORTMUX_DEBUG #ifdef CONFIG_FREERTOS_PORTMUX_DEBUG
vPortCPUAcquireMutex( mux, function, line ); vPortCPUAcquireMutex( mux, function, line );
#else #else
@ -3814,7 +3817,7 @@ scheduler will re-enable the interrupts instead. */
if( pxCurrentTCB[ xPortGetCoreID() ]->uxCriticalNesting == 0U ) if( pxCurrentTCB[ xPortGetCoreID() ]->uxCriticalNesting == 0U )
{ {
portEXIT_CRITICAL_NESTED(uxOldInterruptState); portEXIT_CRITICAL_NESTED(pxCurrentTCB[ xPortGetCoreID() ]->uxOldInterruptState);
} }
else else
{ {