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
-                       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
-                               Address = DESCRIPTOR_ADDRESS(LanguageString);\r
+                               Address = &LanguageString;\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