CTRL keyboard bootloader_jump support

Adds support for CTRL keyboards to enter bootloader via bootloader_jump()

1 files changed, 17 insertions, 15 deletions

diff --git a/tmk_core/common/arm_atsam/bootloader.c b/tmk_core/common/arm_atsam/bootloader.c
index 9701a6219..ba71bfeb0 100644
--- a/tmk_core/common/arm_atsam/bootloader.c
+++ b/tmk_core/common/arm_atsam/bootloader.c
@@ -16,25 +16,27 @@
 
 #include "bootloader.h"
 #include "samd51j18a.h"
+#include "md_bootloader.h"
 
 //Set watchdog timer to reset. Directs the bootloader to stay in programming mode.
-void bootloader_jump(void)
-{
-    //Keyboards released with certain bootloader can not enter bootloader from app until workaround is created
-    uint8_t ver_no_jump[] = "v2.18Jun 22 2018 17:28:08";
-    uint8_t *ver_check = ver_no_jump;
-    uint8_t *boot_check = (uint8_t *)0x21A0;
-    while (*ver_check && *boot_check == *ver_check)
-    {
-        ver_check++;
-        boot_check++;
+void bootloader_jump(void) {
+#ifdef KEYBOARD_massdrop_ctrl
+    //CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method.
+    uint8_t ver_ram_method[] = "v2.18Jun 22 2018 17:28:08";     //The version to match (NULL terminated by compiler)
+    uint8_t *ver_check = ver_ram_method;                        //Pointer to version match string for traversal
+    uint8_t *ver_rom = (uint8_t *)0x21A0;                       //Pointer to address in ROM where this specific bootloader version would exist
+
+    while (*ver_check && *ver_rom == *ver_check) {              //While there are check version characters to match and bootloader's version matches check's version
+        ver_check++;                                            //Move check version pointer to next character
+        ver_rom++;                                              //Move ROM version pointer to next character
     }
-    if (!*ver_check)
-    {
-        //Version match
-        //Software workaround would go here
-        return; //No software restart method implemented... must use hardware reset button
+
+    if (!*ver_check) {                                          //If check version pointer is NULL, all characters have matched
+        *MAGIC_ADDR = BOOTLOADER_MAGIC;                         //Set magic number into RAM
+        NVIC_SystemReset();                                     //Perform system reset
+        while (1) {}                                            //Won't get here
     }
+#endif
 
     WDT->CTRLA.bit.ENABLE = 0;
     while (WDT->SYNCBUSY.bit.ENABLE) {}