Fixed broken USB_GetNextDescriptor() function causing the descriptor to jump ahead...

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

diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h
index 8bd6bdf..8bccd68 100644 (file)
--- a/Bootloaders/CDC/Descriptors.h
+++ b/Bootloaders/CDC/Descriptors.h
@@ -40,11 +40,51 @@
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Macros: */\r
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Macros: */\r

+               #if defined(__AVR_AT90USB1286__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x97\r
+                       #define AVR_SIGNATURE_3               0x82\r
+               #elif defined(__AVR_AT90USB1287__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x97\r
+                       #define AVR_SIGNATURE_3               0x82\r
+               #elif defined(__AVR_AT90USB646__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x96\r
+                       #define AVR_SIGNATURE_3               0x82\r
+               #elif defined(__AVR_AT90USB647__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x96\r
+                       #define AVR_SIGNATURE_3               0x82\r
+               #elif defined(__AVR_AT90USB162__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x94\r
+                       #define AVR_SIGNATURE_3               0x82\r
+               #elif defined(__AVR_AT90USB82__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x94\r
+                       #define AVR_SIGNATURE_3               0x82\r
+               #elif defined(__AVR_ATmega32U6__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x95\r
+                       #define AVR_SIGNATURE_3               0x88\r
+               #elif defined(__AVR_ATmega32U4__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x95\r
+                       #define AVR_SIGNATURE_3               0x87\r
+               #elif defined(__AVR_ATmega16U4__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x94\r
+                       #define AVR_SIGNATURE_3               0x88\r
+               #else\r
+                       #error The selected AVR part is not currently supported by this bootloader.\r
+               #endif\r
+\r

                /** Structure for a CDC class Functional descriptor, with a given data size. This is used instead of a\r
                 *  type define so that the same macro can be used for functional descriptors of varying data lengths,\r
                 *  while allowing the sizeof() operator to return correct results.\r
                 *\r
                /** Structure for a CDC class Functional descriptor, with a given data size. This is used instead of a\r
                 *  type define so that the same macro can be used for functional descriptors of varying data lengths,\r
                 *  while allowing the sizeof() operator to return correct results.\r
                 *\r

-                *  \param DataSize  Size of the functional descriptor's data payload, in bytes\r
+                *  \param[in] DataSize  Size of the functional descriptor's data payload, in bytes\r

                 */\r
                #define CDC_FUNCTIONAL_DESCRIPTOR(DataSize)        \\r
                     struct                                        \\r
                 */\r
                #define CDC_FUNCTIONAL_DESCRIPTOR(DataSize)        \\r
                     struct                                        \\r


@@ -89,7 +129,7 @@
                } USB_Descriptor_Configuration_t;\r
 \r
        /* Function Prototypes: */\r
                } USB_Descriptor_Configuration_t;\r
 \r
        /* Function Prototypes: */\r

-               uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
-                                          ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r
+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
+                                                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r

 \r
 #endif\r
 \r
 #endif\r