Oops - Bootloader optimizations to GetDescriptor() don't work, as the...

Oops - Bootloader optimizations to GetDescriptor() don't work, as the Configuration Descriptor's header does not contain the full length of the descriptor, breaking full enumeration.

Bootloaders/CDC/Descriptors.c

@@ -210,25 +210,34 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 	const uint8_t  DescriptorNumber = (wValue & 0xFF);
 
 	const void* Address = NULL;
+	uint16_t    Size    = NO_DESCRIPTOR;
 
 	switch (DescriptorType)
 	{
 		case DTYPE_Device:
 			Address = &DeviceDescriptor;
+			Size    = sizeof(USB_Descriptor_Device_t);
 			break;
 		case DTYPE_Configuration:
 			Address = &ConfigurationDescriptor;
+			Size    = sizeof(USB_Descriptor_Configuration_t);
 			break;
 		case DTYPE_String:
 			if (!(DescriptorNumber))
+			{
 				Address = &LanguageString;
+				Size    = LanguageString.Header.Size;
+			}
 			else
+			{
 				Address = &ProductString;
+				Size    = ProductString.Header.Size;
+			}
 
 			break;
 	}
 
 	*DescriptorAddress = Address;
-	return (Address != NULL) ? ((USB_Descriptor_Header_t*)Address)->Size : NO_DESCRIPTOR;
+	return Size;
 }
 

Bootloaders/DFU/Descriptors.c

@@ -151,25 +151,34 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 	const uint8_t  DescriptorNumber = (wValue & 0xFF);
 
 	const void* Address = NULL;
+	uint16_t    Size    = NO_DESCRIPTOR;
 
 	switch (DescriptorType)
 	{
 		case DTYPE_Device:
 			Address = &DeviceDescriptor;
+			Size    = sizeof(USB_Descriptor_Device_t);
 			break;
 		case DTYPE_Configuration: 
 			Address = &ConfigurationDescriptor;
+			Size    = sizeof(USB_Descriptor_Configuration_t);
 			break;
 		case DTYPE_String: 
 			if (!(DescriptorNumber))
+			{
 				Address = &LanguageString;
+				Size    = LanguageString.Header.Size;
+			}
 			else
+			{
 				Address = &ProductString;
+				Size    = ProductString.Header.Size;
+			}
 			
 			break;
 	}
 	
 	*DescriptorAddress = Address;
-	return (Address != NULL) ? ((USB_Descriptor_Header_t*)Address)->Size : NO_DESCRIPTOR;
+	return Size;
 }
 

Bootloaders/HID/Descriptors.c

@@ -159,17 +159,27 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 	const void* Address = NULL;
 	uint16_t    Size    = NO_DESCRIPTOR;
 	
+	/* If/Else If chain compiles slightly smaller than a switch case */
 	if (DescriptorType == DTYPE_Device)
+	{
 		Address = &DeviceDescriptor;
+		Size    = sizeof(USB_Descriptor_Device_t);	
+	}
 	else if (DescriptorType == DTYPE_Configuration)
+	{
 		Address = &ConfigurationDescriptor;
+		Size    = sizeof(USB_Descriptor_Configuration_t);	
+	}
 	else if (DescriptorType == HID_DTYPE_HID)
+	{
 		Address = &ConfigurationDescriptor.HID_VendorHID;
+		Size    = sizeof(USB_HID_Descriptor_HID_t);
+	}
 	else
+	{
 		Address = &HIDReport;
-
-	if (Address != NULL)
-	  Size = (Address == &HIDReport) ? sizeof(HIDReport) : ((USB_Descriptor_Header_t*)Address)->Size;
+		Size    = sizeof(HIDReport);
+	}
 
 	*DescriptorAddress = Address;
 	return Size;

LUFA/ManPages/FutureChanges.txt

@@ -17,7 +17,6 @@
   *      -# Investigate virtual hubs when in device mode instead of composite devices
   *      -# Change makefiles to allow for absolute LUFA location to be used
   *      -# Re-add interrupt Pipe/Endpoint support
-  *      -# Investigate dynamically created device descriptors
   *      -# Add makefile includes to reduce boilerplate in user makefiles
   *  - Documentation/Support
   *      -# Add detailed overviews of how each demo works