diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2014-10-11 15:15:02 +1100 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2014-10-11 15:15:02 +1100 |
| commit | df366e055d7c3831bd40d96efe3a91cdeb31e2dd (patch) | |
| tree | 9847b7589af00afeabcaa3530cafc34ed96db6a3 /Bootloaders/CDC/BootloaderCDC.c | |
| parent | 17158b359f8189c39448c96c4746d8738d5fe336 (diff) | |
| download | lufa-df366e055d7c3831bd40d96efe3a91cdeb31e2dd.tar.gz lufa-df366e055d7c3831bd40d96efe3a91cdeb31e2dd.tar.bz2 lufa-df366e055d7c3831bd40d96efe3a91cdeb31e2dd.zip | |
Don't run user application in the bootloader unless a valid app is present (thanks to Alex Kazik).
Diffstat (limited to 'Bootloaders/CDC/BootloaderCDC.c')
| -rw-r--r-- | Bootloaders/CDC/BootloaderCDC.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index f66a483e6..c7eeb929a 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -91,6 +91,10 @@ void Application_Jump_Check(void) 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) */ + 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) { |