Commit of new class abstraction APIs for all device demos other than the MIDI demo...

[pub/lufa.git] / Demos / Device / DualCDC / DualCDC.h

diff --git a/Demos/Device/DualCDC/DualCDC.h b/Demos/Device/DualCDC/DualCDC.h
index 117af60..3c1e296 100644 (file)
--- a/Demos/Device/DualCDC/DualCDC.h
+++ b/Demos/Device/DualCDC/DualCDC.h
@@ -44,75 +44,26 @@
 \r
                #include "Descriptors.h"\r
 \r
-               #include <LUFA/Version.h>                        // Library Version Information\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
-               #include <LUFA/Scheduler/Scheduler.h>            // Simple scheduler for task management\r
+               #include <LUFA/Version.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r
+               #include <LUFA/Drivers/Board/Joystick.h>\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/USB/Class/Device/CDC.h>\r
 \r
        /* Macros: */\r
-               /** CDC Class specific request to get the current virtual serial port configuration settings. */\r
-               #define REQ_GetLineEncoding          0x21\r
-\r
-               /** CDC Class specific request to set the current virtual serial port configuration settings. */\r
-               #define REQ_SetLineEncoding          0x20\r
-\r
-               /** CDC Class specific request to set the current virtual serial port handshake line states. */\r
-               #define REQ_SetControlLineState      0x22\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
-                */\r
-               typedef struct\r
-               {\r
-                       uint32_t BaudRateBPS; /**< Baud rate of the virtual serial port, in bits per second */\r
-                       uint8_t  CharFormat; /**< Character format of the virtual serial port, a value from the\r
-                                             *   CDCDevice_CDC_LineCodingFormats_t enum\r
-                                             */\r
-                       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 character of the virtual serial port */\r
-               } CDC_Line_Coding_t;\r
+               #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
+               #define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)\r
+               #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\r
+               #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
                \r
-       /* Enums: */\r
-               /** Enum for the possible line encoding formats of a virtual serial port. */\r
-               enum CDCDevice_CDC_LineCodingFormats_t\r
-               {\r
-                       OneStopBit          = 0, /**< Each frame contains one stop bit */\r
-                       OneAndAHalfStopBits = 1, /**< Each frame contains one and a half stop bits */\r
-                       TwoStopBits         = 2, /**< Each frame contains two stop bits */\r
-               };\r
-               \r
-               /** Enum for the possible line encoding parity settings of a virtual serial port. */\r
-               enum CDCDevice_LineCodingParity_t\r
-               {\r
-                       Parity_None         = 0, /**< No parity bit mode on each frame */\r
-                       Parity_Odd          = 1, /**< Odd parity bit mode on each frame */\r
-                       Parity_Even         = 2, /**< Even parity bit mode on each frame */\r
-                       Parity_Mark         = 3, /**< Mark parity bit mode on each frame */\r
-                       Parity_Space        = 4, /**< Space parity bit mode on each frame */\r
-               };\r
-\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum DualCDC_StatusCodes_t\r
-               {\r
-                       Status_USBNotReady    = 0, /**< USB is not ready (disconnected from a USB host) */\r
-                       Status_USBEnumerating = 1, /**< USB interface is enumerating */\r
-                       Status_USBReady       = 2, /**< USB interface is connected and ready */\r
-               };\r
-\r
-       /* Tasks: */\r
-               TASK(CDC1_Task);\r
-               TASK(CDC2_Task);\r
-\r
        /* Function Prototypes: */\r
+               void SetupHardware(void);\r
+               void CheckJoystickMovement(void);\r
+\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
+               void EVENT_USB_StartOfFrame(void);\r
                \r
 #endif\r