X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/5251bc6e4e312ec5c4f57c43a92ba49c19684c51..ce3ea6fb2513d3aa14c354e2ed78c7eb4a38ee0e:/LUFA/Drivers/USB/Class/Host/HID.c

diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HID.c
index 4f013d56e..6652cdcbe 100644
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -34,24 +34,15 @@
 #define INCLUDE_FROM_HID_CLASS_HOST_C
 #include "HID.h"
 
-uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint16_t MaxConfigBufferSize)
+uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint16_t ConfigDescriptorSize,
+                                uint8_t* ConfigDescriptorData)
 {
-	uint8_t* ConfigDescriptorData;
-	uint16_t ConfigDescriptorSize;
 	uint8_t  FoundEndpoints = 0;
 
-	if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)
-	  return HID_ENUMERROR_ControlError;
-	
-	if (ConfigDescriptorSize > MaxConfigBufferSize)
-	  return HID_ENUMERROR_DescriptorTooLarge;
-	  
-	ConfigDescriptorData = alloca(ConfigDescriptorSize);
+	memset(&HIDInterfaceInfo->State, 0x00, sizeof(HIDInterfaceInfo->State));
 
-	USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData);
-	
 	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
-	  return HID_ENUMERROR_InvalidConfigDataReturned;
+	  return HID_ENUMERROR_InvalidConfigDescriptor;
 	
 	do
 	{
@@ -62,7 +53,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint
 		}
 	} while (HIDInterfaceInfo->Config.MatchInterfaceProtocol &&
 	         DESCRIPTOR_PCAST(ConfigDescriptorData,
-	                          USB_Descriptor_Interface_t)->HIDInterfaceProtocol != HIDInterfaceInfo->Config.Protocol);
+	                          USB_Descriptor_Interface_t)->Protocol != HIDInterfaceInfo->Config.HIDInterfaceProtocol);
 
 	while (FoundEndpoints != ((1 << HID_FOUND_DATAPIPE_IN) | (1 << HID_FOUND_DATAPIPE_OUT)))
 	{