From: tmk <nobody@nowhere>
Date: Wed, 18 Sep 2013 07:03:03 +0000 (+0900)
Subject: Fix bootloader jump use word address
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=0ca415004a453b2a841880d3a66492c664505737;p=max%2Ftmk_keyboard.git

Fix bootloader jump use word address

- Call of function pointer is compiled into 'icall' instruction.
It should use word address but it has used byte address :( It seems
jump has worked luckily by chance until now. why it worked?
---

diff --git a/common/bootloader.c b/common/bootloader.c
index 43a7e47c..cda295b1 100644
--- a/common/bootloader.c
+++ b/common/bootloader.c
@@ -71,7 +71,8 @@ void bootloader_jump_after_watchdog_reset(void)
         MCUSR &= ~(1<<WDRF);
         wdt_disable();
 
-        ((void (*)(void))BOOTLOADER_START)();
+        // This is compled into 'icall', address should be in word unit, not byte.
+        ((void (*)(void))(BOOTLOADER_START/2))();
     }
 }
 
@@ -141,7 +142,7 @@ void bootloader_jump(void) {
     ADCSRA = 0; TWCR = 0; UCSR0B = 0;
 #endif
 
-    // start Bootloader
-    ((void (*)(void))BOOTLOADER_START)();
+    // This is compled into 'icall', address should be in word unit, not byte.
+    ((void (*)(void))(BOOTLOADER_START/2))();
 }
 #endif