Fixed USB_Host_ClearPipeStall() incorrectly attempting to determine the endpoint...

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

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index 3cf1526..133d8fb 100644 (file)
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -68,16 +68,16 @@
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x97
                        #define AVR_SIGNATURE_3               0x82
-               #elif defined(__AVR_AT90USB1286__)
-                       #define PRODUCT_ID_CODE               0x2FFB
-                       #define AVR_SIGNATURE_1               0x1E
-                       #define AVR_SIGNATURE_2               0x97
-                       #define AVR_SIGNATURE_3               0x82
                #elif defined(__AVR_AT90USB647__)
                        #define PRODUCT_ID_CODE               0x2FF9
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x96
                        #define AVR_SIGNATURE_3               0x82
+               #elif defined(__AVR_AT90USB1286__)
+                       #define PRODUCT_ID_CODE               0x2FFB
+                       #define AVR_SIGNATURE_1               0x1E
+                       #define AVR_SIGNATURE_2               0x97
+                       #define AVR_SIGNATURE_3               0x82
                #elif defined(__AVR_AT90USB646__)
                        #define PRODUCT_ID_CODE               0x2FF9
                        #define AVR_SIGNATURE_1               0x1E
@@ -93,16 +93,16 @@
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x95
                        #define AVR_SIGNATURE_3               0x87
-               #elif defined(__AVR_ATmega32U2__)
-                       #define PRODUCT_ID_CODE               0x2FF0
-                       #define AVR_SIGNATURE_1               0x1E
-                       #define AVR_SIGNATURE_2               0x95
-                       #define AVR_SIGNATURE_3               0x8A
                #elif defined(__AVR_ATmega16U4__)
                        #define PRODUCT_ID_CODE               0x2FF3
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x94
                        #define AVR_SIGNATURE_3               0x88
+               #elif defined(__AVR_ATmega32U2__)
+                       #define PRODUCT_ID_CODE               0x2FF0
+                       #define AVR_SIGNATURE_1               0x1E
+                       #define AVR_SIGNATURE_2               0x95
+                       #define AVR_SIGNATURE_3               0x8A
                #elif defined(__AVR_ATmega16U2__)
                        #define PRODUCT_ID_CODE               0x2FEF
                        #define AVR_SIGNATURE_1               0x1E
@@ -166,7 +166,9 @@
                } USB_Descriptor_Configuration_t;
                
        /* Function Prototypes: */
-               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
-                                                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                                   const uint8_t wIndex,
+                                                   const void** const DescriptorAddress)
+                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif