From f0c72df67452dc1e921ee3673a37b26cbc408c34 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 27 Jun 2013 20:03:33 +0200 Subject: [PATCH] Re-added Set Control Line State request handling to the CDC class bootloader. --- Bootloaders/CDC/BootloaderCDC.c | 8 ++++++++ Bootloaders/CDC/Descriptors.c | 2 +- LUFA/DoxygenPages/ChangeLog.txt | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index acdcde3b9f..74e406629c 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -223,6 +223,14 @@ void EVENT_USB_Device_ControlRequest(void) } break; + case CDC_REQ_SetControlLineState: + if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE)) + { + Endpoint_ClearSETUP(); + Endpoint_ClearStatusStage(); + } + + break; } } diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index 03a4a5daf7..bbf4e76210 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -115,7 +115,7 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor = .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface}, .Subtype = 0x02, - .Capabilities = 0x00, + .Capabilities = 0x02, }, .CDC_Functional_Union = diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index 60dd453ac8..911164475c 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -26,6 +26,9 @@ * - All board drivers now implement dummy functions and constants when BOARD is set to NONE * - Added missing LEDs to the XMEGA A3BU Xplained board LED driver (thanks to Michael Janssen) * - Changed board Dataflash drivers to automatically configure the appropriate SPI interface for the selected board + * - Library Applications: + * - Re-added Set Control Line State request handling to the CDC class bootloader to prevent issues with the .NET serial + * class (thanks to Erik Lins) * * Fixed: * - Core: