Massive cleanups to the incomplete BluetoothHost demo, to make the HCL layer code...

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

diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h
index 94883be..f123477 100644 (file)
--- a/Bootloaders/CDC/Descriptors.h
+++ b/Bootloaders/CDC/Descriptors.h
@@ -40,29 +40,21 @@
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Macros: */\r
-               #if defined(__AVR_AT90USB1286__)\r
+               #if 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_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
+               #elif defined(__AVR_AT90USB1286__)\r
                        #define AVR_SIGNATURE_1               0x1E\r
-                       #define AVR_SIGNATURE_2               0x94\r
+                       #define AVR_SIGNATURE_2               0x97\r
                        #define AVR_SIGNATURE_3               0x82\r
-               #elif defined(__AVR_AT90USB82__)\r
+               #elif defined(__AVR_AT90USB646__)\r
                        #define AVR_SIGNATURE_1               0x1E\r
-                       #define AVR_SIGNATURE_2               0x94\r
+                       #define AVR_SIGNATURE_2               0x96\r
                        #define AVR_SIGNATURE_3               0x82\r
                #elif defined(__AVR_ATmega32U6__)\r
                        #define AVR_SIGNATURE_1               0x1E\r
@@ -76,6 +68,26 @@
                        #define AVR_SIGNATURE_1               0x1E\r
                        #define AVR_SIGNATURE_2               0x94\r
                        #define AVR_SIGNATURE_3               0x88\r
+               #elif defined(__AVR_ATmega32U2__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x94\r
+                       #define AVR_SIGNATURE_3               0x82\r
+               #elif defined(__AVR_ATmega16U2__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x94\r
+                       #define AVR_SIGNATURE_3               0x89\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_ATmega8U2__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x93\r
+                       #define AVR_SIGNATURE_3               0x82\r
+               #elif defined(__AVR_AT90USB82__)\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x93\r
+                       #define AVR_SIGNATURE_3               0x89\r
                #else\r
                        #error The selected AVR part is not currently supported by this bootloader.\r
                #endif\r
@@ -117,15 +129,15 @@
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
-                       USB_Descriptor_Interface_t               CCI_Interface;\r
+                       USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_CallManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
-                       USB_Descriptor_Endpoint_t                ManagementEndpoint;\r
-                       USB_Descriptor_Interface_t               DCI_Interface;\r
-                       USB_Descriptor_Endpoint_t                DataOutEndpoint;\r
-                       USB_Descriptor_Endpoint_t                DataInEndpoint;\r
+                       USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;\r
+                       USB_Descriptor_Interface_t               CDC_DCI_Interface;\r
+                       USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;\r
+                       USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;\r
                } USB_Descriptor_Configuration_t;\r
 \r
        /* Function Prototypes: */\r