diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-05-21 16:37:34 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-05-21 16:37:34 +0000 |
| commit | 6b4a51ae6497416be98571db8455031f88539e28 (patch) | |
| tree | 7f31adb7997a792eb6e2c8a7d121ee4e54660345 | |
| parent | cc3ee891c9316e3106a5b6379c9e9e1b1cb1c195 (diff) | |
Turn off watchdog before jumping to the user application in the DFU and CDC based bootloaders, for the specific case of /HWB being low during reset (where the bootloader will re-enter).
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2233 d5102386-fcda-11dd-9fdb-3debd5008f28
| -rw-r--r-- | Bootloaders/CDC/BootloaderCDC.c | 6 | ||||
| -rw-r--r-- | Bootloaders/DFU/BootloaderDFU.c | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index 211b054e..7bff8999 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -73,7 +73,13 @@ 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)) { + /* 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)(); } diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 233e145a..528e8cb0 100644 --- 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)(); } } |