Remove keyboard level `QK_BOOT` implementations (#24231)

5 files changed, 27 insertions, 41 deletions

diff --git a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
deleted file mode 100644
index ee8d8b2e73..0000000000
--- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "lfk65_hs.h"
-#include <avr/wdt.h>
-
-bool process_record_kb(uint16_t keycode, keyrecord_t* record)
-{
-    if (keycode == QK_BOOT) {
-        reset_keyboard_kb();
-    }
-    return process_record_user(keycode, record);
-}
-
-void reset_keyboard_kb(void){
-#ifdef WATCHDOG_ENABLE
-    MCUSR = 0;
-    wdt_disable();
-    wdt_reset();
-#endif
-    reset_keyboard();
-}
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c
index 3f6cb61263..6fe282bb0b 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.c
+++ b/keyboards/lfkeyboards/lfk78/lfk78.c
@@ -43,20 +43,19 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
     if (click_toggle && record->event.pressed) {
         clicking_notes(click_hz, click_time);
     }
-
-    if (keycode == QK_BOOT) {
-        reset_keyboard_kb();
-    }
-
     return process_record_user(keycode, record);
 }
 
-void reset_keyboard_kb(void) {
+bool shutdown_kb(bool jump_to_bootloader) {
 #ifdef WATCHDOG_ENABLE
+    // Unconditionally run so shutdown_user can't mess up watchdog
     MCUSR = 0;
     wdt_disable();
     wdt_reset();
 #endif
 
-    reset_keyboard();
+    if (!shutdown_user(jump_to_bootloader)) {
+        return false;
+    }
+    return true;
 }
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c
index e6288eb6c1..ff0a038114 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.c
+++ b/keyboards/lfkeyboards/lfk87/lfk87.c
@@ -45,17 +45,19 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
     if (click_toggle && record->event.pressed){
         clicking_notes(click_hz, click_time);
     }
-    if (keycode == QK_BOOT) {
-        reset_keyboard_kb();
-    }
     return process_record_user(keycode, record);
 }
 
-void reset_keyboard_kb(void){
+bool shutdown_kb(bool jump_to_bootloader) {
 #ifdef WATCHDOG_ENABLE
+    // Unconditionally run so shutdown_user can't mess up watchdog
     MCUSR = 0;
     wdt_disable();
     wdt_reset();
 #endif
-    reset_keyboard();
+
+    if (!shutdown_user(jump_to_bootloader)) {
+        return false;
+    }
+    return true;
 }
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c
index 96dc56c03c..1d07ea7b0d 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.c
+++ b/keyboards/lfkeyboards/mini1800/mini1800.c
@@ -47,17 +47,19 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
-    if (keycode == QK_BOOT) {
-        reset_keyboard_kb();
-    }
     return process_record_user(keycode, record);
 }
 
-void reset_keyboard_kb(void){
+bool shutdown_kb(bool jump_to_bootloader) {
 #ifdef WATCHDOG_ENABLE
+    // Unconditionally run so shutdown_user can't mess up watchdog
     MCUSR = 0;
     wdt_disable();
     wdt_reset();
 #endif
-    reset_keyboard();
+
+    if (!shutdown_user(jump_to_bootloader)) {
+        return false;
+    }
+    return true;
 }
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c
index c183ae1b02..970a4d3a10 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.c
+++ b/keyboards/lfkeyboards/smk65/revb/revb.c
@@ -61,17 +61,19 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
-    if (keycode == QK_BOOT) {
-        reset_keyboard_kb();
-    }
     return process_record_user(keycode, record);
 }
 
-void reset_keyboard_kb(void){
+bool shutdown_kb(bool jump_to_bootloader) {
 #ifdef WATCHDOG_ENABLE
+    // Unconditionally run so shutdown_user can't mess up watchdog
     MCUSR = 0;
     wdt_disable();
     wdt_reset();
 #endif
-    reset_keyboard();
+
+    if (!shutdown_user(jump_to_bootloader)) {
+        return false;
+    }
+    return true;
 }