From 296bdfd433992b87a3728ee48d2da28a8a9c02df Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sat, 29 Oct 2022 19:36:40 +0300
Subject: [PATCH] actual proper fix of furi_halt

---
 furi/core/check.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/furi/core/check.c b/furi/core/check.c
index 00c20575a..107eb4d1a 100644
--- a/furi/core/check.c
+++ b/furi/core/check.c
@@ -24,8 +24,8 @@ PLACE_IN_SECTION("MB_MEM2") uint32_t __furi_check_registers[12] = {0};
                  :                                      \
                  : "memory");
 
-// Restore registers and halt MCU
-#define RESTORE_REGISTERS_AND_HALT_MCU()                \
+// Restore registers and halt MCU with bkpt debug state
+#define RESTORE_REGISTERS_AND_HALT_MCU_DEBUG()          \
     asm volatile("ldr r12, =__furi_check_registers  \n" \
                  "ldm r12, {r0-r11}                 \n" \
                  "loop%=:                           \n" \
@@ -36,6 +36,17 @@ PLACE_IN_SECTION("MB_MEM2") uint32_t __furi_check_registers[12] = {0};
                  :                                      \
                  : "memory");
 
+// Restore registers and halt MCU without bkpt debug mode
+#define RESTORE_REGISTERS_AND_HALT_MCU_RELEASE()        \
+    asm volatile("ldr r12, =__furi_check_registers  \n" \
+                 "ldm r12, {r0-r11}                 \n" \
+                 "loop%=:                           \n" \
+                 "wfi                               \n" \
+                 "b loop%=                          \n" \
+                 :                                      \
+                 :                                      \
+                 : "memory");
+
 extern size_t xPortGetTotalHeapSize(void);
 extern size_t xPortGetFreeHeapSize(void);
 extern size_t xPortGetMinimumEverFreeHeapSize(void);
@@ -99,7 +110,7 @@ FURI_NORETURN void __furi_crash() {
 #ifdef FURI_DEBUG
     furi_hal_console_puts("\r\nSystem halted. Connect debugger for more info\r\n");
     furi_hal_console_puts("\033[0m\r\n");
-    RESTORE_REGISTERS_AND_HALT_MCU();
+    RESTORE_REGISTERS_AND_HALT_MCU_DEBUG();
 #else
     furi_hal_rtc_set_fault_data((uint32_t)__furi_check_message);
     furi_hal_console_puts("\r\nRebooting system.\r\n");
@@ -124,6 +135,10 @@ FURI_NORETURN void __furi_halt() {
     furi_hal_console_puts(__furi_check_message);
     furi_hal_console_puts("\r\nSystem halted. Bye-bye!\r\n");
     furi_hal_console_puts("\033[0m\r\n");
-    RESTORE_REGISTERS_AND_HALT_MCU();
+#ifdef FURI_DEBUG
+    RESTORE_REGISTERS_AND_HALT_MCU_DEBUG();
+#else
+    RESTORE_REGISTERS_AND_HALT_MCU_RELEASE();
+#endif
     __builtin_unreachable();
 }