Fix accidentally changed code breaking the HID descriptor parser.

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

diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h
index 7669b83..6a46a55 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


@@ -82,17 +77,7 @@
                #define BOOTLOADER_HWVERSION_MINOR   0x00\r
 \r
                /** Eight character bootloader firmware identifier reported to the host when requested */\r
                #define BOOTLOADER_HWVERSION_MINOR   0x00\r
 \r
                /** Eight character bootloader firmware identifier reported to the host when requested */\r

-               #define SOFTWARE_IDENTIFIER          "LUFA-CDC"\r
-\r
-       /* Event Handlers: */\r
-               /** Indicates that this module will catch the USB_Disconnect event when thrown by the library. */\r
-               HANDLES_EVENT(USB_Disconnect);\r
-\r
-               /** Indicates that this module will catch the USB_ConfigurationChanged event when thrown by the library. */\r
-               HANDLES_EVENT(USB_ConfigurationChanged);\r
-\r
-               /** Indicates that this module will catch the USB_UnhandledControlPacket event when thrown by the library. */\r
-               HANDLES_EVENT(USB_UnhandledControlPacket);\r
+               #define SOFTWARE_IDENTIFIER          "LUFACDC"\r

                \r
        /* Type Defines: */\r
                /** Type define for a non-returning pointer to the start of the loaded application in flash memory. */\r
                \r
        /* Type Defines: */\r
                /** Type define for a non-returning pointer to the start of the loaded application in flash memory. */\r


@@ -128,10 +113,14 @@
                        Parity_Space        = 4, /**< Space data parity checking */\r
                };\r
                \r
                        Parity_Space        = 4, /**< Space data parity checking */\r
                };\r
                \r

-       /* Tasks: */\r
-               TASK(CDC_Task);\r
-\r

        /* Function Prototypes: */\r
        /* Function Prototypes: */\r

+               void CDC_Task(void);\r
+               void SetupHardware(void);\r
+               void ResetHardware(void);\r
+\r
+               void EVENT_USB_Device_ConfigurationChanged(void);\r
+               void EVENT_USB_Device_UnhandledControlRequest(void);\r
+\r

                #if defined(INCLUDE_FROM_BOOTLOADERCDC_C) || defined(__DOXYGEN__)\r
                        static void    ReadWriteMemoryBlock(const uint8_t Command);\r
                        static uint8_t FetchNextCommandByte(void);\r
                #if defined(INCLUDE_FROM_BOOTLOADERCDC_C) || defined(__DOXYGEN__)\r
                        static void    ReadWriteMemoryBlock(const uint8_t Command);\r
                        static uint8_t FetchNextCommandByte(void);\r