Re-add signature byte defines to the DFU and CDC class bootloaders -- the SIGNATURE_x...

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index d72d128..92c2291 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -424,9 +424,9 @@ void CDC_Task(void)
                }\r
                else if (Command == 's')\r
                {\r
                }\r
                else if (Command == 's')\r
                {\r

-                       WriteNextResponseByte(SIGNATURE_2);             \r
-                       WriteNextResponseByte(SIGNATURE_1);\r
-                       WriteNextResponseByte(SIGNATURE_0);\r
+                       WriteNextResponseByte(AVR_SIGNATURE_3);         \r
+                       WriteNextResponseByte(AVR_SIGNATURE_2);\r
+                       WriteNextResponseByte(AVR_SIGNATURE_1);\r

                }\r
                else if (Command == 'b')\r
                {\r
                }\r
                else if (Command == 'b')\r
                {\r

diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h
index 97e32e9..fa98a15 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.h
+++ b/Bootloaders/CDC/BootloaderCDC.h
@@ -46,12 +46,7 @@
 \r
                #include "Descriptors.h"\r
 \r
 \r
                #include "Descriptors.h"\r
 \r

-               #include <LUFA/Drivers/USB/USB.h>                // USB Functionality\r
-\r
-       /* Preprocessor Checks: */\r
-               #if !defined(SIGNATURE_0) || !defined(SIGNATURE_1) || !defined(SIGNATURE_2)\r
-                       #error Device signature byte constants are not defined due to outdated avr-libc version. See demo documentation.\r
-               #endif\r
+               #include <LUFA/Drivers/USB/USB.h>\r

 \r
        /* Macros: */\r
                /** CDC Class Specific request to get the line encoding on a CDC-ACM virtual serial port, including the\r
 \r
        /* Macros: */\r
                /** CDC Class Specific request to get the line encoding on a CDC-ACM virtual serial port, including the\r

diff --git a/Bootloaders/CDC/BootloaderCDC.txt b/Bootloaders/CDC/BootloaderCDC.txt
index 1122e73..c518195 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.txt
+++ b/Bootloaders/CDC/BootloaderCDC.txt
@@ -54,12 +54,5 @@
  *    <td><b>Location:</b></td>\r
  *    <td><b>Description:</b></td>\r
  *   </tr>\r
  *    <td><b>Location:</b></td>\r
  *    <td><b>Description:</b></td>\r
  *   </tr>\r

- *   <tr>\r
- *    <td>SIGNATURE_0, SIGNATURE_1, SIGNATURE_2</td>\r
- *    <td>Makefile CDEFS</td>\r
- *    <td>AVR part signature bytes. These are normally defined as part of the AVR device header files in recent avr-libc\r
- *        distributions. If your avr-libc library is out of date and does not define these values, you can define them\r
- *        manually in the makefile CDEFS.</td>\r
- *   </tr>\r

  *  </table>\r
  */
\ No newline at end of file
  *  </table>\r
  */
\ No newline at end of file

diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h
index d913f45..62d7598 100644 (file)
--- a/Bootloaders/CDC/Descriptors.h
+++ b/Bootloaders/CDC/Descriptors.h
@@ -40,6 +40,46 @@
                #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
                /** 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

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 58a7511..ca0387b 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -678,7 +678,7 @@ static void ProcessWriteCommand(void)
 static void ProcessReadCommand(void)\r
 {\r
        const uint8_t BootloaderInfo[3] = {BOOTLOADER_VERSION, BOOTLOADER_ID_BYTE1, BOOTLOADER_ID_BYTE2};\r
 static void ProcessReadCommand(void)\r
 {\r
        const uint8_t BootloaderInfo[3] = {BOOTLOADER_VERSION, BOOTLOADER_ID_BYTE1, BOOTLOADER_ID_BYTE2};\r

-       const uint8_t SignatureInfo[3]  = {SIGNATURE_0, SIGNATURE_1, SIGNATURE_2};\r
+       const uint8_t SignatureInfo[3]  = {AVR_SIGNATURE_1,    AVR_SIGNATURE_2,     AVR_SIGNATURE_3};\r

 \r
        uint8_t DataIndexToRead = SentCommand.Data[1];\r
 \r
 \r
        uint8_t DataIndexToRead = SentCommand.Data[1];\r
 \r

diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h
index 776281e..a47da3d 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.h
+++ b/Bootloaders/DFU/BootloaderDFU.h
@@ -47,12 +47,7 @@
        \r
                #include "Descriptors.h"\r
                \r
        \r
                #include "Descriptors.h"\r
                \r

-               #include <LUFA/Drivers/USB/USB.h>                // USB Functionality\r
-       \r
-       /* Preprocessor Checks: */\r
-               #if !defined(SIGNATURE_0) || !defined(SIGNATURE_1) || !defined(SIGNATURE_2)\r
-                       #error Device signature byte constants are not defined due to outdated avr-libc version. See demo documentation.\r
-               #endif\r
+               #include <LUFA/Drivers/USB/USB.h>\r

        \r
        /* Macros: */\r
                /** Configuration define. Define this token to true to case the bootloader to reject all memory commands\r
        \r
        /* Macros: */\r
                /** Configuration define. Define this token to true to case the bootloader to reject all memory commands\r

diff --git a/Bootloaders/DFU/BootloaderDFU.txt b/Bootloaders/DFU/BootloaderDFU.txt
index eb6495e..05bfa71 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.txt
+++ b/Bootloaders/DFU/BootloaderDFU.txt
@@ -73,12 +73,5 @@
  *        erase has been performed. This can be used in conjunction with the AVR's lockbits to prevent the AVRs firmware from\r
  *        being dumped by unauthorized persons.</td>\r
  *   </tr>\r
  *        erase has been performed. This can be used in conjunction with the AVR's lockbits to prevent the AVRs firmware from\r
  *        being dumped by unauthorized persons.</td>\r
  *   </tr>\r

- *   <tr>\r
- *    <td>SIGNATURE_0, SIGNATURE_1, SIGNATURE_2</td>\r
- *    <td>Makefile CDEFS</td>\r
- *    <td>AVR part signature bytes. These are normally defined as part of the AVR device header files in recent avr-libc\r
- *        distributions. If your avr-libc library is out of date and does not define these values, you can define them\r
- *        manually in the makefile CDEFS.</td>\r
- *   </tr>\r

  *  </table>\r
  */\r
  *  </table>\r
  */\r

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index 570bb6e..0943ef3 100644 (file)
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -65,22 +65,49 @@
 \r
                #if defined(__AVR_AT90USB1286__)\r
                        #define PRODUCT_ID_CODE               0x2FFB\r
 \r
                #if defined(__AVR_AT90USB1286__)\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
                        #define PRODUCT_ID_CODE               0x2FFB\r
                #elif 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

                #elif defined(__AVR_AT90USB646__)\r
                        #define PRODUCT_ID_CODE               0x2FF9\r
                #elif defined(__AVR_AT90USB646__)\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_AT90USB647__)\r
                        #define PRODUCT_ID_CODE               0x2FF9\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_AT90USB162__)\r
                        #define PRODUCT_ID_CODE               0x2FFA\r
                #elif defined(__AVR_AT90USB162__)\r
                        #define PRODUCT_ID_CODE               0x2FFA\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 PRODUCT_ID_CODE               0x2FF7\r
                #elif defined(__AVR_AT90USB82__)\r
                        #define PRODUCT_ID_CODE               0x2FF7\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 PRODUCT_ID_CODE               0x2FFB\r
                #elif defined(__AVR_ATmega32U6__)\r
                        #define PRODUCT_ID_CODE               0x2FFB\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 PRODUCT_ID_CODE               0x2FF4\r
                #elif defined(__AVR_ATmega32U4__)\r
                        #define PRODUCT_ID_CODE               0x2FF4\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 PRODUCT_ID_CODE               0x2FF3\r
                #elif defined(__AVR_ATmega16U4__)\r
                        #define PRODUCT_ID_CODE               0x2FF3\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
                #else\r
                        #error The selected AVR part is not currently supported by this bootloader.\r
                #endif\r

diff --git a/Bootloaders/TeensyHID/TeensyHID.h b/Bootloaders/TeensyHID/TeensyHID.h
index 9414eec..b7d4d6b 100644 (file)
--- a/Bootloaders/TeensyHID/TeensyHID.h
+++ b/Bootloaders/TeensyHID/TeensyHID.h
@@ -47,8 +47,7 @@
 \r
                #include "Descriptors.h"\r
 \r
 \r
                #include "Descriptors.h"\r
 \r

-               #include <LUFA/Version.h>                    // Library Version Information\r
-               #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
+               #include <LUFA/Drivers/USB/USB.h>\r

                \r
        /* Preprocessor Checks: */\r
                #if !defined(__AVR_AT90USB162__)\r
                \r
        /* Preprocessor Checks: */\r
                #if !defined(__AVR_AT90USB162__)\r