diff options
author | Dean Camera <[email protected]> | 2009-06-26 09:58:43 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2009-06-26 09:58:43 +0000 |
commit | 1756087c3e1ecd21a594eaf7415c12ba1c852a32 (patch) | |
tree | af19541b036148bfe72ff42e6166802a71f11e80 /Bootloaders/DFU | |
parent | b2cf4d32221075c96a7487b1fc0baa2598d373fe (diff) | |
download | qmk_firmware-1756087c3e1ecd21a594eaf7415c12ba1c852a32.tar.gz qmk_firmware-1756087c3e1ecd21a594eaf7415c12ba1c852a32.zip |
Optimize vendor/product description string display code in MassStorageHost.
Remove all Host mode class demos other than the CDCHost class driver demo, so that they can be re-added as they are made once the host mode class framework is designed.
Fixed USB_Host_SendControlRequest() not re-suspending the USB bus when initial device ready-wait fails.
Fixed USB Pad regulator not being disabled on some AVR models when the USB_OPT_REG_DISABLED option is used.
Diffstat (limited to 'Bootloaders/DFU')
-rw-r--r-- | Bootloaders/DFU/BootloaderDFU.c | 2 | ||||
-rw-r--r-- | Bootloaders/DFU/makefile | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index ca0387ba76..b8a25185d5 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -96,7 +96,7 @@ uint16_t EndAddr = 0x0000; * runs the bootloader processing routine until instructed to soft-exit, or hard-reset via the watchdog to start
* the loaded application code.
*/
-int main (void)
+int main(void)
{
/* Configure hardware required by the bootloader */
SetupHardware();
diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index 06551d5616..40013ca0f5 100644 --- a/Bootloaders/DFU/makefile +++ b/Bootloaders/DFU/makefile @@ -92,6 +92,10 @@ F_CPU = 8000000 F_CLOCK = 8000000
+# Starting byte address of the bootloader
+BOOT_START = 0x1E000
+
+
# Output format. (can be srec, ihex, binary)
FORMAT = ihex
@@ -178,10 +182,6 @@ EXTRAINCDIRS = $(LUFA_PATH)/ CSTANDARD = -std=gnu99
-# Starting byte address of the bootloader
-BOOT_START = 0x1E000
-
-
# Place -D or -U options here for C sources
CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
|