aboutsummaryrefslogtreecommitdiff
path: root/Bootloaders/DFU/BootloaderDFU.c
diff options
context:
space:
mode:
authorDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2012-02-05 16:00:48 +0000
committerDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2012-02-05 16:00:48 +0000
commitb5f2a4e576a677252eb5741fdbdeb641089d9bb0 (patch)
tree802d82c832ca6553c02e19336819cb5959656828 /Bootloaders/DFU/BootloaderDFU.c
parent9b0c63fa0a32478a8f5bdd90a9ab4a23a19cb1f0 (diff)
Add new tag for the LUFA-120219-BETA release.LUFA-120219-BETA
git-svn-id: http://lufa-lib.googlecode.com/svn/tags/LUFA-120219-BETA@2033 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Bootloaders/DFU/BootloaderDFU.c')
-rw-r--r--Bootloaders/DFU/BootloaderDFU.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 09480192..3ce2a628 100644
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -1,13 +1,13 @@
/*
LUFA Library
- Copyright (C) Dean Camera, 2011.
+ Copyright (C) Dean Camera, 2012.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
- Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 2012 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
@@ -137,7 +137,7 @@ int main(void)
}
/** Configures all hardware required for the bootloader. */
-void SetupHardware(void)
+static void SetupHardware(void)
{
/* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF);
@@ -150,7 +150,7 @@ void SetupHardware(void)
MCUCR = (1 << IVCE);
MCUCR = (1 << IVSEL);
- /* Initialize the USB subsystem */
+ /* Initialize the USB and other board hardware drivers */
USB_Init();
LEDs_Init();
@@ -160,10 +160,11 @@ void SetupHardware(void)
}
/** Resets all configured hardware required for the bootloader back to their original states. */
-void ResetHardware(void)
+static void ResetHardware(void)
{
- /* Shut down the USB subsystem */
+ /* Shut down the USB and other board hardware drivers */
USB_Disable();
+ LEDs_Disable();
/* Relocate the interrupt vector table back to the application section */
MCUCR = (1 << IVCE);