Minor cleanup to Attributes.h spacing and rename old multiple-inclusion macro guard.

[pub/USBasp.git] / Bootloaders / DFU / BootloaderDFU.c

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 233e145..32b6eac 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -106,11 +106,18 @@ uint32_t MagicBootKey ATTR_NO_INIT;
  */
 void Application_Jump_Check(void)
 {
-       // If the reset source was the bootloader and the key is correct, clear it and jump to the application
+       /* If the reset source was the bootloader and the key is correct, clear it and jump to the application */
        if ((MCUSR & (1 << WDRF)) && (MagicBootKey == MAGIC_BOOT_KEY))
        {
+               /* Turn off the watchdog */
+               MCUSR &= ~(1<<WDRF);
+               wdt_disable(); 
+
+               /* Clear the boot key and jump to the user application */
                MagicBootKey = 0;
-               AppStartPtr();
+
+               // cppcheck-suppress constStatement
+               ((void (*)(void))0x0000)();
        }
 }
 
@@ -186,6 +193,10 @@ static void ResetHardware(void)
        /* Shut down the USB and other board hardware drivers */
        USB_Disable();
        LEDs_Disable();
+       
+       /* Disable Bootloader active LED toggle timer */
+       TIMSK1 = 0;
+       TCCR1B = 0;
 
        /* Relocate the interrupt vector table back to the application section */
        MCUCR = (1 << IVCE);