noisymime
/
ArduinoCore-avr
mirror of https://github.com/noisymime/ArduinoCore-avr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Save/restore the watchdog during USB auto-reset 

The state of the watchdog timer is saved during a USB auto-reset and then
restored if the reset is aborted, in case the sketch is using the watchdog.
This commit is contained in:
Scott Allen 2017-03-10 15:35:59 -05:00 committed by Martino Facchin
parent 289faaa759
commit 10e0811c52
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cores/arduino/CDC.cpp
View File

@ -34,6 +34,8 @@ typedef struct
static volatile LineInfo _usbLineInfo = { 57600, 0x00, 0x00, 0x00, 0x00 }; static volatile LineInfo _usbLineInfo = { 57600, 0x00, 0x00, 0x00, 0x00 };
static volatile int32_t breakValue = -1; static volatile int32_t breakValue = -1;
static u8 wdtcsr_save;
bool _updatedLUFAbootloader = false; bool _updatedLUFAbootloader = false;
#define WEAK __attribute__ ((weak)) #define WEAK __attribute__ ((weak))
@ -127,6 +129,8 @@ bool CDC_Setup(USBSetup& setup)
#endif #endif
// Store boot key // Store boot key
*(uint16_t *)magic_key_pos = MAGIC_KEY; *(uint16_t *)magic_key_pos = MAGIC_KEY;
// Save the watchdog state in case the reset is aborted.
wdtcsr_save = WDTCSR;
wdt_enable(WDTO_120MS); wdt_enable(WDTO_120MS);
} }
else if (*(uint16_t *)magic_key_pos == MAGIC_KEY) else if (*(uint16_t *)magic_key_pos == MAGIC_KEY)
@ -138,8 +142,10 @@ bool CDC_Setup(USBSetup& setup)
// Cancellation is only done if an auto-reset was started, which is // Cancellation is only done if an auto-reset was started, which is
// indicated by the magic key having been set. // indicated by the magic key having been set.
wdt_disable();
wdt_reset(); wdt_reset();
// Restore the watchdog state in case the sketch was using it.
WDTCSR |= (1<<WDCE) | (1<<WDE);
WDTCSR = wdtcsr_save;
#if MAGIC_KEY_POS != (RAMEND-1) #if MAGIC_KEY_POS != (RAMEND-1)
// Restore backed up (old bootloader) magic key data // Restore backed up (old bootloader) magic key data
if (magic_key_pos != (RAMEND-1)) { if (magic_key_pos != (RAMEND-1)) {