diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index f92595615610374aa9505f2e81df7236c7647b6a..d1f595c3996ff0b8e889526792c3e33aefb890e7 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 13a4f9f5ef78b64fea5c6d84abd69c6cda18f5cf..6a46a55dab1cf60dc27eb34da8b6a055a0009261 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 fb326a1d9855c3f64f8dc817c7d4a2edef635124..d7af1e6ca6ac8d88efc61cd6ee373b089624061c 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 11d91db796fc6309a00d7037b3b92f1812eb31e8..a4eb235d6012194e06dbcd668bf0dbcc02fc63d0 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 ea31537dc138600b4e02e59e0485415a036d3773..0bdb57ebf74e39498df75c752d869013fe3d3adb 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