Remove serial driver use from the AVRISP project now that it is no longer needed.

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

diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h
index a47da3d..aac341f 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.h
+++ b/Bootloaders/DFU/BootloaderDFU.h
@@ -55,7 +55,7 @@
                 *  can protect the AVR's firmware from being dumped from a secured AVR. When false, memory operations are\r
                 *  allowed at any time.\r
                 */\r
                 *  can protect the AVR's firmware from being dumped from a secured AVR. When false, memory operations are\r
                 *  allowed at any time.\r
                 */\r

-               #define SECURE_MODE           false\r
+               #define SECURE_MODE              false\r

 \r
                /** Major bootloader version number. */\r
                #define BOOTLOADER_VERSION_MINOR 2\r
 \r
                /** Major bootloader version number. */\r
                #define BOOTLOADER_VERSION_MINOR 2\r


@@ -76,18 +76,18 @@
                \r
                /** Convenience macro, used to determine if the issued command is the given one-byte long command.\r
                 *\r
                \r
                /** Convenience macro, used to determine if the issued command is the given one-byte long command.\r
                 *\r

-                *  \param dataarr  Command byte array to check against\r
-                *  \param cb1      First command byte to check\r
+                *  \param[in] dataarr  Command byte array to check against\r
+                *  \param[in] cb1      First command byte to check\r

                 */\r
                 */\r

-               #define IS_ONEBYTE_COMMAND(dataarr, cb1)       (dataarr[0] == cb1)\r
+               #define IS_ONEBYTE_COMMAND(dataarr, cb1)       (dataarr[0] == (cb1))\r

 \r
                /** Convenience macro, used to determine if the issued command is the given two-byte long command.\r
                 *\r
 \r
                /** Convenience macro, used to determine if the issued command is the given two-byte long command.\r
                 *\r

-                *  \param dataarr  Command byte array to check against\r
-                *  \param cb1      First command byte to check\r
-                *  \param cb2      Second command byte to check\r
+                *  \param[in] dataarr  Command byte array to check against\r
+                *  \param[in] cb1      First command byte to check\r
+                *  \param[in] cb2      Second command byte to check\r

                 */\r
                 */\r

-               #define IS_TWOBYTE_COMMAND(dataarr, cb1, cb2) ((dataarr[0] == cb1) && (dataarr[1] == cb2))\r
+               #define IS_TWOBYTE_COMMAND(dataarr, cb1, cb2) ((dataarr[0] == (cb1)) && (dataarr[1] == (cb2)))\r

        \r
                /** Length of the DFU file suffix block, appended to the end of each complete memory write command.\r
                 *  The DFU file suffix is currently unused (but is designed to give extra file information, such as\r
        \r
                /** Length of the DFU file suffix block, appended to the end of each complete memory write command.\r
                 *  The DFU file suffix is currently unused (but is designed to give extra file information, such as\r


@@ -191,8 +191,7 @@
                void SetupHardware(void);\r
                void ResetHardware(void);\r
 \r
                void SetupHardware(void);\r
                void ResetHardware(void);\r
 \r

-               void EVENT_USB_Disconnect(void);\r
-               void EVENT_USB_UnhandledControlPacket(void);\r
+               void EVENT_USB_Device_UnhandledControlRequest(void);\r

 \r
                #if defined(INCLUDE_FROM_BOOTLOADER_C)\r
                        static void DiscardFillerBytes(uint8_t NumberOfBytes);\r
 \r
                #if defined(INCLUDE_FROM_BOOTLOADER_C)\r
                        static void DiscardFillerBytes(uint8_t NumberOfBytes);\r