From: Dean Camera <dean@fourwalledcubicle.com>
Date: Thu, 27 Jun 2013 18:03:33 +0000 (+0200)
Subject: Re-added Set Control Line State request handling to the CDC class bootloader.
X-Git-Tag: LUFA-130901-BETA~35
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/f0c72df67452dc1e921ee3673a37b26cbc408c34

Re-added Set Control Line State request handling to the CDC class bootloader.
---

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index acdcde3b9..74e406629 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 03a4a5daf..bbf4e7621 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 60dd453ac..911164475 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)
   *
   *  <b>Fixed:</b>
   *  - Core: