aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2012-05-29 19:40:05 +0000
committerDean Camera <dean@fourwalledcubicle.com>2012-05-29 19:40:05 +0000
commitd4684b29b9a3a4b45b6422d0f1cf6c79639c84c8 (patch)
treea524204e69920767f78459304d4c5eade527970d
parent2ff1370221d3650a6bc0523c93c2f0d37508f408 (diff)
downloadlufa-d4684b29b9a3a4b45b6422d0f1cf6c79639c84c8.tar.gz
lufa-d4684b29b9a3a4b45b6422d0f1cf6c79639c84c8.tar.bz2
lufa-d4684b29b9a3a4b45b6422d0f1cf6c79639c84c8.zip
Ensure the DFU bootloader disables and clears the activity LED toggle timer when a soft-reset to application space is used.
-rw-r--r--Bootloaders/DFU/BootloaderDFU.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 528e8cb0c..32b6eacec 100644
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -193,6 +193,10 @@ static void ResetHardware(void)
/* Shut down the USB and other board hardware drivers */
USB_Disable();
LEDs_Disable();
+
+ /* Disable Bootloader active LED toggle timer */
+ TIMSK1 = 0;
+ TCCR1B = 0;
/* Relocate the interrupt vector table back to the application section */
MCUCR = (1 << IVCE);