From 1756087c3e1ecd21a594eaf7415c12ba1c852a32 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Fri, 26 Jun 2009 09:58:43 +0000
Subject: 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.
---
 Bootloaders/CDC/makefile        | 10 +++++-----
 Bootloaders/DFU/BootloaderDFU.c |  2 +-
 Bootloaders/DFU/makefile        |  8 ++++----
 Bootloaders/TeensyHID/makefile  |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'Bootloaders')

diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index 9a707c5ed..0c977f807 100644
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -48,7 +48,7 @@
 
 
 # MCU name
-MCU = at90usb1287
+MCU = at90usb647
 
 
 # Target board (see library "Board Types" documentation, USER or blank for projects not requiring
@@ -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
 
@@ -177,10 +181,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
diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index ca0387ba7..b8a25185d 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 06551d561..40013ca0f 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
diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile
index 13d28e5d6..356d7380e 100644
--- a/Bootloaders/TeensyHID/makefile
+++ b/Bootloaders/TeensyHID/makefile
@@ -92,6 +92,10 @@ F_CPU = 16000000
 F_CLOCK = 16000000
 
 
+# Starting byte address of the bootloader
+BOOT_START = 0xC000
+
+
 # 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 = 0xC000
-
-
 # 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
-- 
cgit v1.2.3