Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and...

[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / ConfigDescriptor.c

diff --git a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
index 4c6fbfd..67e72e6 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
+++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
@@ -31,8 +31,8 @@
 #include "ConfigDescriptor.h"\r
 \r
 #if defined(USB_CAN_BE_HOST)\r
-uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr,\r
-                                      void* BufferPtr, uint16_t BufferSize)\r
+uint8_t USB_Host_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr,\r
+                                           void* BufferPtr, uint16_t BufferSize)\r
 {\r
        uint8_t ErrorCode;\r
        uint8_t ConfigHeader[sizeof(USB_Descriptor_Configuration_Header_t)];\r
@@ -51,11 +51,7 @@ uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const Conf
        if ((ErrorCode = USB_Host_SendControlRequest(ConfigHeader)) != HOST_SENDCONTROL_Successful)\r
          return ErrorCode;\r
 \r
-       #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\r
        *ConfigSizePtr = DESCRIPTOR_CAST(ConfigHeader, USB_Descriptor_Configuration_Header_t).TotalConfigurationSize;\r
-       #else\r
-       *ConfigSizePtr = DESCRIPTOR_CAST(ConfigHeader, USB_Descriptor_Configuration_Header_t).wTotalLength;             \r
-       #endif\r
 \r
        if (*ConfigSizePtr > BufferSize)\r
          return HOST_GETCONFIG_BuffOverflow;\r
@@ -73,7 +69,7 @@ uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const Conf
 #endif\r
 \r
 void USB_GetNextDescriptorOfType(uint16_t* const BytesRem,\r
-                                 uint8_t** const CurrConfigLoc,\r
+                                 void** const CurrConfigLoc,\r
                                  const uint8_t Type)\r
 {\r
        while (*BytesRem)\r
@@ -86,7 +82,7 @@ void USB_GetNextDescriptorOfType(uint16_t* const BytesRem,
 }\r
 \r
 void USB_GetNextDescriptorOfTypeBefore(uint16_t* const BytesRem,\r
-                                       uint8_t** const CurrConfigLoc,\r
+                                       void** const CurrConfigLoc,\r
                                        const uint8_t Type,\r
                                        const uint8_t BeforeType)\r
 {\r
@@ -107,7 +103,7 @@ void USB_GetNextDescriptorOfTypeBefore(uint16_t* const BytesRem,
 }\r
 \r
 void USB_GetNextDescriptorOfTypeAfter(uint16_t* const BytesRem,\r
-                                      uint8_t** const CurrConfigLoc,\r
+                                      void** const CurrConfigLoc,\r
                                       const uint8_t Type,\r
                                       const uint8_t AfterType)\r
 {\r
@@ -117,7 +113,7 @@ void USB_GetNextDescriptorOfTypeAfter(uint16_t* const BytesRem,
          USB_GetNextDescriptorOfType(BytesRem, CurrConfigLoc, Type);\r
 }\r
                        \r
-uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, uint8_t** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine)\r
+uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, void** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine)\r
 {\r
        uint8_t ErrorCode;\r
                \r