alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-14 22:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix psram task coredump block

Browse Source 
Fix coredump erase flash delay
This commit is contained in:
maojianxin
2020-03-19 22:50:59 +08:00
parent 00d6b12671
commit c2dac74cc5
4 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/esp32/panic.c
View File

@@ -47,6 +47,8 @@
#include "SEGGER_RTT.h"
#endif
static bool g_panic_interrupt_state = false;
#if CONFIG_ESP32_APPTRACE_ONPANIC_HOST_FLUSH_TMO == -1
#define APPTRACE_ONPANIC_HOST_FLUSH_TMO ESP_APPTRACE_TMO_INFINITE
#else
@@ -433,6 +435,7 @@ static inline void disableAllWdts()
TIMERG0.wdt_config0.en = 0;
TIMERG0.wdt_wprotect = 0;
TIMERG1.wdt_wprotect = TIMG_WDT_WKEY_VALUE;
TIMERG1.int_clr_timers.wdt = 1;
TIMERG1.wdt_config0.en = 0;
TIMERG1.wdt_wprotect = 0;
}
@@ -621,11 +624,8 @@ static __attribute__((noreturn)) void commonErrorHandler(XtExcFrame *frame)
disableAllWdts();
s_dumping_core = true;
#if CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH
if (xPortGetCoreID() == APP_CPU_NUM) {
panicPutStr("Current task in APP CPU, skip...\n");
} else {
esp_core_dump_to_flash(frame);
}
g_panic_interrupt_state = true;
esp_core_dump_to_flash(frame);
#endif
#if CONFIG_ESP32_ENABLE_COREDUMP_TO_UART && !CONFIG_ESP32_PANIC_SILENT_REBOOT
esp_core_dump_to_uart(frame);
@@ -659,6 +659,10 @@ void esp_set_breakpoint_if_jtag(void *fn)
}
}
bool esp_check_in_panic_status(void)
{
return g_panic_interrupt_state;
}
esp_err_t esp_set_watchpoint(int no, void *adr, int size, int flags)
{