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

Merge branch 'bugfix/phy_critical' into 'master'

Browse source 
Bugfix/phy critical

See merge request espressif/esp-idf!6890
This commit is contained in:
Jiang Jiang Jian 2019-12-04 11:26:58 +08:00
commit 71ae2956cd
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/esp_wifi/src/phy_init.c
View file

@ -75,14 +75,28 @@ static _lock_t s_modem_sleep_lock;
static int64_t s_phy_rf_en_ts = 0; static int64_t s_phy_rf_en_ts = 0;
#endif #endif
static DRAM_ATTR portMUX_TYPE s_phy_int_mux = portMUX_INITIALIZER_UNLOCKED;
uint32_t IRAM_ATTR phy_enter_critical(void) uint32_t IRAM_ATTR phy_enter_critical(void)
{ {
return portENTER_CRITICAL_NESTED(); if (xPortInIsrContext()) {
portENTER_CRITICAL_ISR(&s_phy_int_mux);
} else {
portENTER_CRITICAL(&s_phy_int_mux);
}
// Interrupt level will be stored in current tcb, so always return zero.
return 0;
} }
void IRAM_ATTR phy_exit_critical(uint32_t level) void IRAM_ATTR phy_exit_critical(uint32_t level)
{ {
portEXIT_CRITICAL_NESTED(level); // Param level don't need any more, ignore it.
if (xPortInIsrContext()) {
portEXIT_CRITICAL_ISR(&s_phy_int_mux);
} else {
portEXIT_CRITICAL(&s_phy_int_mux);
}
} }
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32