Move the length decrements in the pipe and endpoint stream functions to the point...

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

diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h
index 5a83403..e996f2b 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.h
+++ b/Bootloaders/DFU/BootloaderDFU.h
@@ -48,7 +48,12 @@
                #include "Descriptors.h"\r
                \r
                #include <LUFA/Drivers/USB/USB.h>                // USB Functionality\r
                #include "Descriptors.h"\r
                \r
                #include <LUFA/Drivers/USB/USB.h>                // USB Functionality\r

-               \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
+       \r

        /* Macros: */\r
                /** Configuration define. Define this token to true to case the bootloader to reject all memory commands\r
                 *  until a memory erase has been performed. When used in conjunction with the lockbits of the AVR, this\r
        /* Macros: */\r
                /** Configuration define. Define this token to true to case the bootloader to reject all memory commands\r
                 *  until a memory erase has been performed. When used in conjunction with the lockbits of the AVR, this\r


@@ -63,7 +68,7 @@
                /** Minor bootloader version number. */\r
                #define BOOTLOADER_VERSION_REV   0\r
 \r
                /** Minor bootloader version number. */\r
                #define BOOTLOADER_VERSION_REV   0\r
 \r

-               /** Complete bootloder version number expressed as a packed byte, constructed from the \r
+               /** Complete bootloader version number expressed as a packed byte, constructed from the \r

                 *  two individual bootloader version macros.\r
                 */\r
                #define BOOTLOADER_VERSION       ((BOOTLOADER_VERSION_MINOR << 4) | BOOTLOADER_VERSION_REV)\r
                 *  two individual bootloader version macros.\r
                 */\r
                #define BOOTLOADER_VERSION       ((BOOTLOADER_VERSION_MINOR << 4) | BOOTLOADER_VERSION_REV)\r


@@ -100,7 +105,7 @@
                 */\r
                #define DFU_FILLER_BYTES_SIZE    26\r
        \r
                 */\r
                #define DFU_FILLER_BYTES_SIZE    26\r
        \r

-               /** DFU class command request to detatch from the host. */\r
+               /** DFU class command request to detach from the host. */\r

                #define DFU_DETATCH              0x00\r
 \r
                /** DFU class command request to send data from the host to the bootloader. */\r
                #define DFU_DETATCH              0x00\r
 \r
                /** DFU class command request to send data from the host to the bootloader. */\r


@@ -141,7 +146,7 @@
                /** Type define for a non-returning function pointer to the loaded application. */\r
                typedef void (*AppPtr_t)(void) ATTR_NO_RETURN;\r
                \r
                /** Type define for a non-returning function pointer to the loaded application. */\r
                typedef void (*AppPtr_t)(void) ATTR_NO_RETURN;\r
                \r

-               /** Type define for a strucuture containing a complete DFU command issued by the host. */\r
+               /** Type define for a structure containing a complete DFU command issued by the host. */\r

                typedef struct\r
                {\r
                        uint8_t  Command; /**< Single byte command to perform, one of the COMMAND_* macro values */\r
                typedef struct\r
                {\r
                        uint8_t  Command; /**< Single byte command to perform, one of the COMMAND_* macro values */\r