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

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / DevChapter9.c

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index fa35a1b..50afb61 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -232,14 +232,9 @@ static void USB_Device_GetInternalSerialDescriptor(void)
                int16_t                 UnicodeString[20];\r
        } SignatureDescriptor;\r
 \r
                int16_t                 UnicodeString[20];\r
        } SignatureDescriptor;\r
 \r

-       #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\r
-               SignatureDescriptor.Header.Size            = sizeof(SignatureDescriptor);\r
-               SignatureDescriptor.Header.Type            = DTYPE_String;\r
-       #else\r
-               SignatureDescriptor.Header.bLength         = sizeof(SignatureDescriptor);\r
-               SignatureDescriptor.Header.bDescriptorType = DTYPE_String;\r
-       #endif\r
-\r
+       SignatureDescriptor.Header.Size  = sizeof(SignatureDescriptor);\r
+       SignatureDescriptor.Header.Type  = DTYPE_String;\r
+       \r

        uint8_t  SigReadAddress     = 0x0E;\r
 \r
        for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)\r
        uint8_t  SigReadAddress     = 0x0E;\r
 \r
        for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)\r