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

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

diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h
index da75593..d83b27f 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.h
+++ b/Bootloaders/CDC/BootloaderCDC.h
@@ -46,12 +46,7 @@
 \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
@@ -109,7 +104,7 @@
                };\r
                \r
                /** Enum for the possible parity modes on a CDC-ACM virtual serial port */\r
-               enum BootloaderCDC_CDC_LineCodeingParity_t\r
+               enum BootloaderCDC_CDC_LineCodingParity_t\r
                {\r
                        Parity_None         = 0, /**< No data parity checking */\r
                        Parity_Odd          = 1, /**< Odd data parity checking */\r
@@ -118,13 +113,13 @@
                        Parity_Space        = 4, /**< Space data parity checking */\r
                };\r
                \r
-       /* Tasks: */\r
-               TASK(CDC_Task);\r
-\r
        /* Function Prototypes: */\r
-               void EVENT_USB_Disconnect(void);\r
-               void EVENT_USB_ConfigurationChanged(void);\r
-               void EVENT_USB_UnhandledControlPacket(void);\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