espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-07-04 08:03:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/disable_other_task_before_nmi_disabled' into 'master'

Browse Source 
fix(freertos): disable other task before disable nmi

See merge request sdk/ESP8266_RTOS_SDK!1568
This commit is contained in:
Dong Heng
2020-11-25 14:36:22 +08:00
parent 89c81f7a69 a6556a85d4
commit ea4f93b727
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

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