michi/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't run user application in the bootloader unless a valid app is present (thanks to Alex Kazik).

Browse Source
This commit is contained in:
Dean Camera
2014-10-11 15:15:02 +11:00
parent 17158b359f
commit df366e055d
5 changed files with 68 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Bootloaders/MassStorage/BootloaderMassStorage.c
View File

@@ -116,13 +116,22 @@ 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 ((MCUSR & (1 << WDRF)) && (MagicBootKey == MAGIC_BOOT_KEY))
{
MagicBootKey = 0;
JumpToApplication = true;
}
JumpToApplication |= true;
/* Don't run the user application if the reset vector is blank (no app loaded) */
if (pgm_read_word_near(0) == 0xFFFF)
JumpToApplication = false;
/* If a request has been made to jump to the user application, honor it */
if (JumpToApplication)
{
/* Turn off the watchdog */
MCUSR &= ~(1<<WDRF);
wdt_disable();
/* Clear the boot key and jump to the user application */
MagicBootKey = 0;
// cppcheck-suppress constStatement
((void (*)(void))0x0000)();
}