Remove USE_NONSTANDARD_DESCRIPTOR_NAMES compile time token, split out standard descri...

[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..6b20f46 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
+++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
@@ -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 ((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
        *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
 \r
        if (*ConfigSizePtr > BufferSize)\r
          return HOST_GETCONFIG_BuffOverflow;\r