Fixed invalid USB controller PLL prescaler values for the ATMEGAxxU2 controllers

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

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index 4faea42..32d5828 100644 (file)
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -63,12 +63,17 @@
                 */             \r
                #define ATTR_CAN_DOWNLOAD                 (1 << 0)\r
 \r
                 */             \r
                #define ATTR_CAN_DOWNLOAD                 (1 << 0)\r
 \r

-               #if defined(__AVR_AT90USB1286__)\r
+               #if defined(__AVR_AT90USB1287__)\r

                        #define PRODUCT_ID_CODE               0x2FFB\r
                        #define AVR_SIGNATURE_1               0x1E\r
                        #define AVR_SIGNATURE_2               0x97\r
                        #define AVR_SIGNATURE_3               0x82\r
                        #define PRODUCT_ID_CODE               0x2FFB\r
                        #define AVR_SIGNATURE_1               0x1E\r
                        #define AVR_SIGNATURE_2               0x97\r
                        #define AVR_SIGNATURE_3               0x82\r

-               #elif defined(__AVR_AT90USB1287__)\r
+               #elif defined(__AVR_AT90USB647__)\r
+                       #define PRODUCT_ID_CODE               0x2FF9\r
+                       #define AVR_SIGNATURE_1               0x1E\r
+                       #define AVR_SIGNATURE_2               0x96\r
+                       #define AVR_SIGNATURE_3               0x82\r
+               #elif defined(__AVR_AT90USB1286__)\r

                        #define PRODUCT_ID_CODE               0x2FFB\r
                        #define AVR_SIGNATURE_1               0x1E\r
                        #define AVR_SIGNATURE_2               0x97\r
                        #define PRODUCT_ID_CODE               0x2FFB\r
                        #define AVR_SIGNATURE_1               0x1E\r
                        #define AVR_SIGNATURE_2               0x97\r


@@ -83,11 +88,6 @@
                        #define AVR_SIGNATURE_1               0x1E\r
                        #define AVR_SIGNATURE_2               0x95\r
                        #define AVR_SIGNATURE_3               0x88\r
                        #define AVR_SIGNATURE_1               0x1E\r
                        #define AVR_SIGNATURE_2               0x95\r
                        #define AVR_SIGNATURE_3               0x88\r

-               #elif defined(__AVR_AT90USB647__)\r
-                       #define PRODUCT_ID_CODE               0x2FF9\r
-                       #define AVR_SIGNATURE_1               0x1E\r
-                       #define AVR_SIGNATURE_2               0x96\r
-                       #define AVR_SIGNATURE_3               0x82\r

                #elif defined(__AVR_ATmega32U4__)\r
                        #define PRODUCT_ID_CODE               0x2FF4\r
                        #define AVR_SIGNATURE_1               0x1E\r
                #elif defined(__AVR_ATmega32U4__)\r
                        #define PRODUCT_ID_CODE               0x2FF4\r
                        #define AVR_SIGNATURE_1               0x1E\r


@@ -98,6 +98,16 @@
                        #define AVR_SIGNATURE_1               0x1E\r
                        #define AVR_SIGNATURE_2               0x94\r
                        #define AVR_SIGNATURE_3               0x88\r
                        #define AVR_SIGNATURE_1               0x1E\r
                        #define AVR_SIGNATURE_2               0x94\r
                        #define AVR_SIGNATURE_3               0x88\r

+               #elif defined(__AVR_ATmega32U2__)\r
+                       #define PRODUCT_ID_CODE               0x2FF0\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 PRODUCT_ID_CODE               0x2FEF\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 PRODUCT_ID_CODE               0x2FFA\r
                        #define AVR_SIGNATURE_1               0x1E\r
                #elif defined(__AVR_AT90USB162__)\r
                        #define PRODUCT_ID_CODE               0x2FFA\r
                        #define AVR_SIGNATURE_1               0x1E\r


@@ -108,11 +118,6 @@
                        #define AVR_SIGNATURE_1               0x1E\r
                        #define AVR_SIGNATURE_2               0x93\r
                        #define AVR_SIGNATURE_3               0x82\r
                        #define AVR_SIGNATURE_1               0x1E\r
                        #define AVR_SIGNATURE_2               0x93\r
                        #define AVR_SIGNATURE_3               0x82\r

-               #elif defined(__AVR_ATmega16U2__)\r
-                       #define PRODUCT_ID_CODE               0x2FEF\r
-                       #define AVR_SIGNATURE_1               0x1E\r
-                       #define AVR_SIGNATURE_2               0x94\r
-                       #define AVR_SIGNATURE_3               0x89\r

                #elif defined(__AVR_AT90USB82__)\r
                        #define PRODUCT_ID_CODE               0x2FEE\r
                        #define AVR_SIGNATURE_1               0x1E\r
                #elif defined(__AVR_AT90USB82__)\r
                        #define PRODUCT_ID_CODE               0x2FEE\r
                        #define AVR_SIGNATURE_1               0x1E\r