fix(freertos): disable other task before disable nmi

Zhang Jun Hao · Zhang Jun Hao · commit a6556a85d49d · 2020-11-25T11:15:17.000+08:00
diff --git a/components/freertos/port/esp8266/port.c b/components/freertos/port/esp8266/port.c
@@ -297,9 +297,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);
@@ -322,9 +323,10 @@ void IRAM_ATTR vPortETSIntrUnlock(void)
 
             REG_WRITE(INT_ENA_WDEV, WDEV_INTEREST_EVENT);
         }
-        vPortExitCritical();
 
         REG_WRITE(NMI_INT_ENABLE_REG, regval);
+
+        vPortExitCritical();
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -297,9 +297,10 @@ void IRAM_ATTR vPortETSIntrLock(void)`
`297`	`297`	`if (NMIIrqIsOn == 0) {`
`298`	`298`	`uint32_t regval = REG_READ(NMI_INT_ENABLE_REG);`
`299`	`299`
	`300`	`+ vPortEnterCritical();`
	`301`	`+`
`300`	`302`	`REG_WRITE(NMI_INT_ENABLE_REG, 0);`
`301`	`303`
`302`		`- vPortEnterCritical();`
`303`	`304`	`if (!ESP_NMI_IS_CLOSED()) {`
`304`	`305`	`do {`
`305`	`306`	`REG_WRITE(INT_ENA_WDEV, WDEV_TSF0_REACH_INT);`
`@@ -322,9 +323,10 @@ void IRAM_ATTR vPortETSIntrUnlock(void)`
`322`	`323`
`323`	`324`	`REG_WRITE(INT_ENA_WDEV, WDEV_INTEREST_EVENT);`
`324`	`325`	`}`
`325`		`- vPortExitCritical();`
`326`	`326`
`327`	`327`	`REG_WRITE(NMI_INT_ENABLE_REG, regval);`
	`328`	`+`
	`329`	`+ vPortExitCritical();`
`328`	`330`	`}`
`329`	`331`	`}`
`330`	`332`