diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-09-06 20:30:26 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-09-06 20:30:26 +0000 |
| commit | 1190652c0b210fe24320f8da9bfd5a0e169111d8 (patch) | |
| tree | e05f2760a9ed5555eb5195614f4c3ef4ea7e59a7 | |
| parent | 0486f12e3eab71e75273b774bb13eeb5937c544d (diff) | |
| download | lufa-1190652c0b210fe24320f8da9bfd5a0e169111d8.tar.gz lufa-1190652c0b210fe24320f8da9bfd5a0e169111d8.tar.bz2 lufa-1190652c0b210fe24320f8da9bfd5a0e169111d8.zip | |
Fixed DFU and CDC class bootloaders on the AT90USBXXX2 series USB AVRs.
| -rw-r--r-- | Bootloaders/CDC/BootloaderCDC.c | 9 | ||||
| -rw-r--r-- | Bootloaders/CDC/BootloaderCDC.h | 1 | ||||
| -rw-r--r-- | Bootloaders/DFU/BootloaderDFU.c | 9 | ||||
| -rw-r--r-- | Bootloaders/DFU/BootloaderDFU.h | 1 | ||||
| -rw-r--r-- | LUFA/ManPages/ChangeLog.txt | 1 |
5 files changed, 1 insertions, 20 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index f92595615..d1f595c39 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -116,15 +116,6 @@ void ResetHardware(void) boot_rww_enable();
}
-/** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user
- * application started.
- */
-void EVENT_USB_Device_Disconnect(void)
-{
- /* Upon disconnection, run user application */
- RunBootloader = false;
-}
-
/** Event handler for the USB_ConfigurationChanged event. This configures the device's endpoints ready
* to relay data to and from the attached USB host.
*/
diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h index 13a4f9f5e..6a46a55da 100644 --- a/Bootloaders/CDC/BootloaderCDC.h +++ b/Bootloaders/CDC/BootloaderCDC.h @@ -118,7 +118,6 @@ void SetupHardware(void);
void ResetHardware(void);
- void EVENT_USB_Device_Disconnect(void);
void EVENT_USB_Device_ConfigurationChanged(void);
void EVENT_USB_Device_UnhandledControlRequest(void);
diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index fb326a1d9..d7af1e6ca 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -141,15 +141,6 @@ void ResetHardware(void) MCUCR = 0;
}
-/** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user
- * application started.
- */
-void EVENT_USB_Device_Disconnect(void)
-{
- /* Upon disconnection, run user application */
- RunBootloader = false;
-}
-
/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific
* control requests that are not handled internally by the USB library (including the DFU commands, which are
* all issued via the control endpoint), so that they can be handled appropriately for the application.
diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h index 11d91db79..a4eb235d6 100644 --- a/Bootloaders/DFU/BootloaderDFU.h +++ b/Bootloaders/DFU/BootloaderDFU.h @@ -191,7 +191,6 @@ void SetupHardware(void);
void ResetHardware(void);
- void EVENT_USB_Device_Disconnect(void);
void EVENT_USB_Device_UnhandledControlRequest(void);
#if defined(INCLUDE_FROM_BOOTLOADER_C)
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index ea31537dc..0bdb57ebf 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -60,6 +60,7 @@ * - CDC based demos and project now work under 64 bit versions of Windows (thanks to Ronny Hanson, Thomas Bleeker)
* - Re-add in flip, flip-ee, dfu and dfu-ee targets to project makefiles (thanks to Opendous Inc.)
* - Fix allowable F_CPU values comment in project makefiles
+ * - Fixed DFU and CDC class bootloaders on the AT90USBXXX2 series USB AVRs
*
*
* \section Sec_ChangeLog090810 Version 090810
|