Added module file dependancy information to the USB class drivers.

[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 9acf300..f49f5b3 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -179,30 +179,52 @@ static void USB_Device_GetDescriptor(void)
        void*    DescriptorPointer;\r
        uint16_t DescriptorSize;\r
        \r
-       #if defined(USE_INTERNAL_SERIAL)\r
+       #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
        if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))\r
        {\r
-               uint8_t SignatureDescriptor[2 + (sizeof(int16_t) * 20)];\r
-\r
-               SignatureDescriptor[0] = sizeof(SignatureDescriptor);\r
-               SignatureDescriptor[1] = DTYPE_String;\r
+               struct\r
+               {\r
+                       USB_Descriptor_Header_t Header;\r
+                       int16_t                 UnicodeString[12];\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
-               uint16_t* SigUnicodeChars = (uint16_t*)&SignatureDescriptor[2];\r
+               uint8_t  SigReadAddress  = 0x0E;                \r
+               bool     OddRead         = false;\r
 \r
-               for (uint8_t SerialByteNum = 0; SerialByteNum < 10; SerialByteNum++)\r
+               for (uint8_t SerialCharNum = 0; SerialCharNum < 12; SerialCharNum++)\r
                {\r
-                       char ConvSigString[3];\r
-\r
-                       itoa(boot_signature_byte_get(0x0E + SerialByteNum), ConvSigString, 16);\r
+                       uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);\r
                        \r
-                       SigUnicodeChars[0] = toupper(ConvSigString[0]);\r
-                       SigUnicodeChars[1] = toupper(ConvSigString[1]);\r
+                       if (OddRead)\r
+                       {\r
+                               SerialByte >>= 4;\r
+                               SigReadAddress++;\r
+                       }\r
+                       else\r
+                       {\r
+                               SerialByte &= 0x0F;\r
+                       }\r
                        \r
-                       SigUnicodeChars += 2;\r
+                       OddRead = !(OddRead);\r
+\r
+                       if (SerialByte < 0x0A)\r
+                         SerialByte += '0';\r
+                       else\r
+                         SerialByte += ('A' - 0x0A);\r
+\r
+                       SignatureDescriptor.UnicodeString[SerialCharNum] = SerialByte;\r
                }\r
                \r
                Endpoint_ClearSETUP();\r
-               Endpoint_Write_Control_Stream_LE(SignatureDescriptor, sizeof(SignatureDescriptor));\r
+               Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));\r
                Endpoint_ClearOUT();\r
 \r
                return;\r
@@ -219,47 +241,12 @@ static void USB_Device_GetDescriptor(void)
 \r
        #if defined(USE_RAM_DESCRIPTORS)\r
        Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);\r
+       #elif defined(USE_EEPROM_DESCRIPTORS)\r
+       Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);\r
        #else\r
-       bool SendZLP;\r
-       \r
-       if (USB_ControlRequest.wLength > DescriptorSize)\r
-         USB_ControlRequest.wLength = DescriptorSize;\r
-       \r
-       while (USB_ControlRequest.wLength)\r
-       {\r
-               while (!(Endpoint_IsINReady()))\r
-               {\r
-                       if (Endpoint_IsOUTReceived())\r
-                       {\r
-                               Endpoint_ClearOUT();\r
-                               return;\r
-                       }               \r
-               }\r
-               \r
-               while (USB_ControlRequest.wLength && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
-               {\r
-                       #if defined (USE_EEPROM_DESCRIPTORS)\r
-                       Endpoint_Write_Byte(eeprom_read_byte(DescriptorPointer++));             \r
-                       #else\r
-                       Endpoint_Write_Byte(pgm_read_byte(DescriptorPointer++));\r
-                       #endif\r
-                       \r
-                       USB_ControlRequest.wLength--;\r
-               }\r
-               \r
-               SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
-               Endpoint_ClearIN();\r
-       }\r
-       \r
-       if (SendZLP)\r
-       {\r
-               while (!(Endpoint_IsINReady()));\r
-               Endpoint_ClearIN();\r
-       }\r
-\r
-       while (!(Endpoint_IsOUTReceived()));\r
+       Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);   \r
        #endif\r
-       \r
+\r
        Endpoint_ClearOUT();\r
 }\r
 \r