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

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

diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c
index 94f7404..cff3cd5 100644 (file)
--- a/Bootloaders/DFU/Descriptors.c
+++ b/Bootloaders/DFU/Descriptors.c
@@ -154,22 +154,22 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device:\r
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device:\r

-                       Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);\r
+                       Address = &DeviceDescriptor;\r

                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration: \r
                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration: \r

-                       Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);\r
+                       Address = &ConfigurationDescriptor;\r

                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String: \r
                        if (!(DescriptorNumber))\r
                        {\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String: \r
                        if (!(DescriptorNumber))\r
                        {\r

-                               Address = DESCRIPTOR_ADDRESS(LanguageString);\r
+                               Address = &LanguageString;\r

                                Size    = LanguageString.Header.Size;\r
                        }\r
                        else\r
                        {\r
                                Size    = LanguageString.Header.Size;\r
                        }\r
                        else\r
                        {\r

-                               Address = DESCRIPTOR_ADDRESS(ProductString);\r
+                               Address = &ProductString;\r

                                Size    = ProductString.Header.Size;\r
                        }\r
                        \r
                                Size    = ProductString.Header.Size;\r
                        }\r
                        \r