Преглед изворни кода

gdbstub: Mark the panic handler entry as noreturn

Fixes a warning in panic.c when this panic mode is enabled.
Angus Gratton пре 8 година
родитељ
комит
c049cd55a6
2 измењених фајлова са 5 додато и 5 уклоњено
  1. 2 2
      components/esp32/include/esp_gdbstub.h
  2. 3 3
      components/esp32/panic.c

+ 2 - 2
components/esp32/include/esp_gdbstub.h

@@ -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
+#endif

+ 3 - 3
components/esp32/panic.c

@@ -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 */
 }