Removed DESCRIPTOR_ADDRESS() macro as it was largely supurflous and only served to...

[pub/USBasp.git] / Bootloaders / TeensyHID / Descriptors.c

diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index b1642f1..62e2d21 100644 (file)
--- a/Bootloaders/TeensyHID/Descriptors.c
+++ b/Bootloaders/TeensyHID/Descriptors.c
@@ -183,32 +183,32 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device:\r
-                       Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);\r
+                       Address = (void*)&DeviceDescriptor;\r
                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration:\r
-                       Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);\r
+                       Address = (void*)&ConfigurationDescriptor;\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String:\r
                        if (!(DescriptorNumber))\r
                        {\r
-                               Address = DESCRIPTOR_ADDRESS(LanguageString);\r
+                               Address = (void*)&LanguageString;\r
                                Size    = LanguageString.Header.Size;\r
                        }\r
                        else\r
                        {\r
-                               Address = DESCRIPTOR_ADDRESS(ProductString);\r
+                               Address = (void*)&ProductString;\r
                                Size    = ProductString.Header.Size;\r
                        }\r
                        \r
                        break;\r
                case DTYPE_HID:\r
-                       Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.HIDDescriptor);\r
+                       Address = (void*)&ConfigurationDescriptor.HIDDescriptor;\r
                        Size    = sizeof(USB_Descriptor_HID_t);\r
                        break;\r
                case DTYPE_Report:\r
-                       Address = DESCRIPTOR_ADDRESS(HIDReport);\r
+                       Address = (void*)&HIDReport;\r
                        Size    = sizeof(HIDReport);\r
                        break;\r
        }\r