X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Fbootloader.c;h=43a7e47ce23fb78213348e0f1cca1db5519b56bf;hb=74aea627e7bb924df81d7944705ab40db036be93;hp=77fa1b30a721f26d54281267a928cd35e2bf17a5;hpb=4d64fd8faa8b1a0ceb9019446ba6915aaf1812ea;p=tmk_firmware.git

diff --git a/common/bootloader.c b/common/bootloader.c
index 77fa1b3..43a7e47 100644
--- a/common/bootloader.c
+++ b/common/bootloader.c
@@ -11,16 +11,20 @@
 #endif
 
 
-/* Boot Section Size in bytes
- * Teensy halfKay   512
- * Atmel DFU loader 4096
- * LUFA bootloader  4096
+/* Boot Section Size in *BYTEs*
+ *   Teensy   halfKay    512
+ *   Teensy++ halfKay    1024
+ *   Atmel DFU loader    4096
+ *   LUFA bootloader     4096
+ *   USBaspLoader        2048
  */
-#ifndef BOOT_SIZE
-#define BOOT_SIZE 512
+#ifndef BOOTLOADER_SIZE
+#warning To use bootloader_jump() you need to define BOOTLOADER_SIZE in config.h.
+#define BOOTLOADER_SIZE     4096
 #endif
-#define FLASH_SIZE          (FLASHEND + 1)
-#define BOOTLOADER_START    (FLASH_SIZE - BOOT_SIZE)
+
+#define FLASH_SIZE          (FLASHEND + 1L)
+#define BOOTLOADER_START    (FLASH_SIZE - BOOTLOADER_SIZE)
 
 
 /* 
@@ -58,13 +62,15 @@ void bootloader_jump_after_watchdog_reset(void) __attribute__ ((used, naked, sec
 void bootloader_jump_after_watchdog_reset(void)
 {
     if ((MCUSR & (1<<WDRF)) && reset_key == BOOTLOADER_RESET_KEY) {
+        reset_key = 0;
 
-        #if defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__)
-        // This makes custom USBasploader come up.
+        // My custom USBasploader requires this to come up.
         MCUSR = 0;
-        #endif
 
-        reset_key = 0;
+        // Seems like Teensy halfkay loader requires clearing WDRF and disabling watchdog.
+        MCUSR &= ~(1<<WDRF);
+        wdt_disable();
+
         ((void (*)(void))BOOTLOADER_START)();
     }
 }
@@ -138,4 +144,4 @@ void bootloader_jump(void) {
     // start Bootloader
     ((void (*)(void))BOOTLOADER_START)();
 }
-#endif     
+#endif