espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 20:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'buxfix/panic_handler_not_halting_cpu' into 'master'

Browse Source 
Panic Handler not halting when running on both cores

See merge request !903
This commit is contained in:
Ivan Grokhotkov
2017-06-23 11:34:03 +08:00
parent e918ee20da 21f02a6955
commit 85baf0afaa
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp32/panic.c
View File

@@ -197,6 +197,7 @@ void panicHandler(XtExcFrame *frame)
return; return;
} }
haltOtherCore(); haltOtherCore();
esp_dport_access_int_deinit();
panicPutStr("Guru Meditation Error: Core "); panicPutStr("Guru Meditation Error: Core ");
panicPutDec(core_id); panicPutDec(core_id);
panicPutStr(" panic'ed ("); panicPutStr(" panic'ed (");
@@ -244,6 +245,7 @@ void panicHandler(XtExcFrame *frame)
void xt_unhandled_exception(XtExcFrame *frame) void xt_unhandled_exception(XtExcFrame *frame)
{ {
haltOtherCore(); haltOtherCore();
esp_dport_access_int_deinit();
if (!abort_called) { if (!abort_called) {
panicPutStr("Guru Meditation Error of type "); panicPutStr("Guru Meditation Error of type ");
int exccause = frame->exccause; int exccause = frame->exccause;