Merge branch 'bugfix/fix_nmi_used_critical_function_at_flash' into 'master'

wujiangang · wujiangang · commit da436b52c2d3 · 2018-08-10T11:24:38.000+08:00
Link critical function to IRAM

See merge request sdk/ESP8266_RTOS_SDK!381
diff --git a/components/esp8266/source/esp_wifi_os_adapter.c b/components/esp8266/source/esp_wifi_os_adapter.c
@@ -16,6 +16,7 @@
 
 #include "esp_libc.h"
 #include "esp_system.h"
+#include "esp_attr.h"
 #include "esp_wifi_os_adapter.h"
 
 #include "freertos/FreeRTOS.h"
@@ -30,14 +31,14 @@
 #include "esp_newlib.h"
 #endif
 
-static uint32_t enter_critical_wrapper(void)
+static uint32_t IRAM_ATTR enter_critical_wrapper(void)
 {
     taskENTER_CRITICAL();
 
     return 0;
 }
 
-static void exit_critical_wrapper(uint32_t tmp)
+static void IRAM_ATTR exit_critical_wrapper(uint32_t tmp)
 {
     taskEXIT_CRITICAL();
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`#include "esp_libc.h"`
`18`	`18`	`#include "esp_system.h"`
	`19`	`+#include "esp_attr.h"`
`19`	`20`	`#include "esp_wifi_os_adapter.h"`
`20`	`21`
`21`	`22`	`#include "freertos/FreeRTOS.h"`
`@@ -30,14 +31,14 @@`
`30`	`31`	`#include "esp_newlib.h"`
`31`	`32`	`#endif`
`32`	`33`
`33`		`-static uint32_t enter_critical_wrapper(void)`
	`34`	`+static uint32_t IRAM_ATTR enter_critical_wrapper(void)`
`34`	`35`	`{`
`35`	`36`	`taskENTER_CRITICAL();`
`36`	`37`
`37`	`38`	`return 0;`
`38`	`39`	`}`
`39`	`40`
`40`		`-static void exit_critical_wrapper(uint32_t tmp)`
	`41`	`+static void IRAM_ATTR exit_critical_wrapper(uint32_t tmp)`
`41`	`42`	`{`
`42`	`43`	`taskEXIT_CRITICAL();`
`43`	`44`	`}`