alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/gdbstub_handler_noreturn' into 'master'

Browse Source 
gdbstub: Mark the panic handler entry as noreturn

See merge request !975
This commit is contained in:
Angus Gratton 2017-07-12 17:23:59 +08:00
commit d8d2933bde
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp32/include/esp_gdbstub.h
View File

@ -17,6 +17,6 @@
#include <xtensa/config/core.h>
#include "freertos/xtensa_api.h"
void esp_gdbstub_panic_handler(XtExcFrame *frame);
void esp_gdbstub_panic_handler(XtExcFrame *frame) __attribute__((noreturn));
#endif

6
components/esp32/panic.c
View File

@ -479,7 +479,7 @@ static __attribute__((noreturn)) void commonErrorHandler(XtExcFrame *frame)
esp_core_dump_to_uart(frame);
#endif
reconfigureAllWdts();
#endif
#endif /* CONFIG_ESP32_ENABLE_COREDUMP */
esp_panic_wdt_stop();
#if CONFIG_ESP32_PANIC_PRINT_REBOOT || CONFIG_ESP32_PANIC_SILENT_REBOOT
panicPutStr("Rebooting...\r\n");
@ -493,8 +493,8 @@ static __attribute__((noreturn)) void commonErrorHandler(XtExcFrame *frame)
disableAllWdts();
panicPutStr("CPU halted.\r\n");
while (1);
#endif
#endif
#endif /* CONFIG_ESP32_PANIC_PRINT_REBOOT || CONFIG_ESP32_PANIC_SILENT_REBOOT */
#endif /* CONFIG_ESP32_PANIC_GDBSTUB */
}