USB_IsConnected is now cleared before the USB_Disconnect() event is fired in response...

[pub/USBasp.git] / Demos / Device / CDC / CDC.h

diff --git a/Demos/Device/CDC/CDC.h b/Demos/Device/CDC/CDC.h
index d953303..4c4ca74 100644 (file)
--- a/Demos/Device/CDC/CDC.h
+++ b/Demos/Device/CDC/CDC.h
@@ -45,7 +45,6 @@
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>                        // Library Version Information\r
-               #include <LUFA/Common/ButtLoadTag.h>             // PROGMEM tags readable by the ButtLoad project\r
                #include <LUFA/Drivers/USB/USB.h>                // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>         // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>             // LEDs driver\r
@@ -98,33 +97,20 @@
                #define CONTROL_LINE_IN_RING         (1 << 3)\r
 \r
                /** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,\r
-                *  to indicate that a framing error has ocurred on the virtual serial port.\r
+                *  to indicate that a framing error has occurred on the virtual serial port.\r
                 */\r
                #define CONTROL_LINE_IN_FRAMEERROR   (1 << 4)\r
 \r
                /** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,\r
-                *  to indicate that a parity error has ocurred on the virtual serial port.\r
+                *  to indicate that a parity error has occurred on the virtual serial port.\r
                 */\r
                #define CONTROL_LINE_IN_PARITYERROR  (1 << 5)\r
 \r
                /** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,\r
-                *  to indicate that a data overrun error has ocurred on the virtual serial port.\r
+                *  to indicate that a data overrun error has occurred on the virtual serial port.\r
                 */\r
                #define CONTROL_LINE_IN_OVERRUNERROR (1 << 6)\r
                \r
-       /* Event Handlers: */\r
-               /** Indicates that this module will catch the USB_Connect event when thrown by the library. */\r
-               HANDLES_EVENT(USB_Connect);\r
-\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
-               \r
        /* Type Defines: */\r
                /** Type define for the virtual serial port line encoding settings, for storing the current USART configuration\r
                 *  as set by the host via a class specific request.\r
@@ -138,7 +124,7 @@
                        uint8_t  ParityType; /**< Parity setting of the virtual serial port, a value from the\r
                                              *   CDCDevice_LineCodingParity_t enum\r
                                              */\r
-                       uint8_t  DataBits; /**< Bits of data per charater of the virtual serial port */\r
+                       uint8_t  DataBits; /**< Bits of data per character of the virtual serial port */\r
                } CDC_Line_Coding_t;\r
                \r
                /** Type define for a CDC notification, sent to the host via the CDC notification endpoint to indicate a\r
@@ -186,6 +172,11 @@
                TASK(CDC_Task);\r
 \r
        /* Function Prototypes: */\r
+               void EVENT_USB_Connect(void);\r
+               void EVENT_USB_Disconnect(void);\r
+               void EVENT_USB_ConfigurationChanged(void);\r
+               void EVENT_USB_UnhandledControlPacket(void);\r
+\r
                void UpdateStatus(uint8_t CurrentStatus);\r
 \r
 #endif\r