espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-10-22 16:59:19 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/disable_other_task_before_nmi_disabled_v3.3' into 'release/v3.3'

Browse Source 
fix(freertos): disable other task before disable nmi(backport v3.3)

See merge request sdk/ESP8266_RTOS_SDK!1570
This commit is contained in:
Dong Heng
2020-11-25 14:36:12 +08:00
parent f54641d7f3 547378a329
commit 610c44d247
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/freertos/port/esp8266/port.c
View File

@@ -283,9 +283,10 @@ void IRAM_ATTR vPortETSIntrLock(void)
if (NMIIrqIsOn == 0) {
uint32_t regval = REG_READ(NMI_INT_ENABLE_REG);
vPortEnterCritical();
REG_WRITE(NMI_INT_ENABLE_REG, 0);
vPortEnterCritical();
if (!ESP_NMI_IS_CLOSED()) {
do {
REG_WRITE(INT_ENA_WDEV, WDEV_TSF0_REACH_INT);
@@ -308,9 +309,10 @@ void IRAM_ATTR vPortETSIntrUnlock(void)
REG_WRITE(INT_ENA_WDEV, WDEV_INTEREST_EVENT);
}
vPortExitCritical();
REG_WRITE(NMI_INT_ENABLE_REG, regval);
vPortExitCritical();
}
}