Add Leonardo compatibility to most bootloaders, run user application if BOOTRST fuse...

[pub/USBasp.git] / Bootloaders / MassStorage / BootloaderMassStorage.c

diff --git a/Bootloaders/MassStorage/BootloaderMassStorage.c b/Bootloaders/MassStorage/BootloaderMassStorage.c
index 191d49e..afbc250 100644 (file)
--- a/Bootloaders/MassStorage/BootloaderMassStorage.c
+++ b/Bootloaders/MassStorage/BootloaderMassStorage.c
@@ -91,11 +91,11 @@ void Application_Jump_Check(void)
 
        #if (BOARD == BOARD_LEONARDO)
                /* Enable pull-up on the IO13 pin so we can use it to select the mode */
 
        #if (BOARD == BOARD_LEONARDO)
                /* Enable pull-up on the IO13 pin so we can use it to select the mode */

-               PORTC |=  (1 << 7);
+               PORTC |= (1 << 7);

                Delay_MS(10);
 
                /* If IO13 is not jumpered to ground, start the user application instead */
                Delay_MS(10);
 
                /* If IO13 is not jumpered to ground, start the user application instead */

-               JumpToApplication |= ((PINC & (1 << 7)) != 0);
+               JumpToApplication = ((PINC & (1 << 7)) != 0);

 
                /* Disable pull-up after the check has completed */
                PORTC &= ~(1 << 7);
 
                /* Disable pull-up after the check has completed */
                PORTC &= ~(1 << 7);


@@ -108,25 +108,30 @@ void Application_Jump_Check(void)
                Delay_MS(10);
 
                /* If the TCK pin is not jumpered to ground, start the user application instead */
                Delay_MS(10);
 
                /* If the TCK pin is not jumpered to ground, start the user application instead */

-               JumpToApplication |= ((PINF & (1 << 4)) != 0);
+               JumpToApplication = ((PINF & (1 << 4)) != 0);

 
                /* Re-enable JTAG debugging */
                JTAG_ENABLE();
 
                /* Re-enable JTAG debugging */
                JTAG_ENABLE();

+       #else
+               /* Check if the device's BOOTRST fuse is set */
+               if (boot_lock_fuse_bits_get(GET_HIGH_FUSE_BITS) & FUSE_BOOTRST)
+               {
+                       /* If the reset source was not an external reset or the key is correct, clear it and jump to the application */
+                       if (!(MCUSR & (1 << EXTRF)) || (MagicBootKey == MAGIC_BOOT_KEY))
+                         JumpToApplication = true;
+
+                       MCUSR &= ~(1 << EXTRF);
+               }

        #endif
 
        #endif
 

-       /* 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))
-         JumpToApplication |= true;
-

        /* Don't run the user application if the reset vector is blank (no app loaded) */
        /* Don't run the user application if the reset vector is blank (no app loaded) */

-       if (pgm_read_word_near(0) == 0xFFFF)
-         JumpToApplication = false;
+       bool ApplicationValid = (pgm_read_word_near(0) != 0xFFFF);

 
        /* If a request has been made to jump to the user application, honor it */
 
        /* If a request has been made to jump to the user application, honor it */

-       if (JumpToApplication)
+       if (JumpToApplication && ApplicationValid)

        {
                /* Turn off the watchdog */
        {
                /* Turn off the watchdog */

-               MCUSR &= ~(1<<WDRF);
+               MCUSR &= ~(1 << WDRF);

                wdt_disable();
 
                /* Clear the boot key and jump to the user application */
                wdt_disable();
 
                /* Clear the boot key and jump to the user application */