Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Demos / Device / LowLevel / DualVirtualSerial / DualVirtualSerial.h

diff --git a/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.h b/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.h
index b667501..51ce80d 100644 (file)
--- a/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.h
+++ b/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -51,15 +51,6 @@
                #include <LUFA/Drivers/Board/LEDs.h>
 
        /* Macros: */
-               /** CDC Class specific request to get the current virtual serial port configuration settings. */
-               #define REQ_GetLineEncoding       0x21
-
-               /** CDC Class specific request to set the current virtual serial port configuration settings. */
-               #define REQ_SetLineEncoding       0x20
-
-               /** CDC Class specific request to set the current virtual serial port handshake line states. */
-               #define REQ_SetControlLineState   0x22
-
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
                #define LEDMASK_USB_NOTREADY      LEDS_LED1
 
@@ -72,41 +63,6 @@
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)
 
-       /* Type Defines: */
-               /** Type define for the virtual serial port line encoding settings, for storing the current USART configuration
-                *  as set by the host via a class specific request.
-                */
-               typedef struct
-               {
-                       uint32_t BaudRateBPS; /**< Baud rate of the virtual serial port, in bits per second */
-                       uint8_t  CharFormat; /**< Character format of the virtual serial port, a value from the
-                                             *   CDCDevice_CDC_LineCodingFormats_t enum
-                                             */
-                       uint8_t  ParityType; /**< Parity setting of the virtual serial port, a value from the
-                                             *   CDCDevice_LineCodingParity_t enum
-                                             */
-                       uint8_t  DataBits; /**< Bits of data per character of the virtual serial port */
-               } CDC_Line_Coding_t;
-
-       /* Enums: */
-               /** Enum for the possible line encoding formats of a virtual serial port. */
-               enum CDCDevice_CDC_LineCodingFormats_t
-               {
-                       OneStopBit          = 0, /**< Each frame contains one stop bit */
-                       OneAndAHalfStopBits = 1, /**< Each frame contains one and a half stop bits */
-                       TwoStopBits         = 2, /**< Each frame contains two stop bits */
-               };
-
-               /** Enum for the possible line encoding parity settings of a virtual serial port. */
-               enum CDCDevice_LineCodingParity_t
-               {
-                       Parity_None         = 0, /**< No parity bit mode on each frame */
-                       Parity_Odd          = 1, /**< Odd parity bit mode on each frame */
-                       Parity_Even         = 2, /**< Even parity bit mode on each frame */
-                       Parity_Mark         = 3, /**< Mark parity bit mode on each frame */
-                       Parity_Space        = 4, /**< Space parity bit mode on each frame */
-               };
-
        /* Function Prototypes: */
                void CDC1_Task(void);
                void CDC2_Task(void);
@@ -115,7 +71,7 @@
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);
-               void EVENT_USB_Device_UnhandledControlRequest(void);
+               void EVENT_USB_Device_ControlRequest(void);
 
 #endif