Move out many of the common class driver constants into grouped enums, to make them...

[pub/lufa.git] / LUFA / Drivers / USB / Class / Host / CDC.c

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDC.c
index b9e4c9e..5a87c77 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/CDC.c
+++ b/LUFA/Drivers/USB/Class/Host/CDC.c
@@ -212,7 +212,7 @@ void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
                USB_Request_Header_t Notification;
                Pipe_Read_Stream_LE(&Notification, sizeof(USB_Request_Header_t), NO_STREAM_CALLBACK);
                
                USB_Request_Header_t Notification;
                Pipe_Read_Stream_LE(&Notification, sizeof(USB_Request_Header_t), NO_STREAM_CALLBACK);
                

-               if ((Notification.bRequest      == NOTIF_SerialState) &&
+               if ((Notification.bRequest      == CDC_NOTIF_SerialState) &&

                    (Notification.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)))
                {
                        Pipe_Read_Stream_LE(&CDCInterfaceInfo->State.ControlLineStates.DeviceToHost,
                    (Notification.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)))
                {
                        Pipe_Read_Stream_LE(&CDCInterfaceInfo->State.ControlLineStates.DeviceToHost,


@@ -239,7 +239,7 @@ uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInf
        USB_ControlRequest = (USB_Request_Header_t)
        {
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
        USB_ControlRequest = (USB_Request_Header_t)
        {
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),

-               .bRequest      = REQ_SetLineEncoding,
+               .bRequest      = CDC_REQ_SetLineEncoding,

                .wValue        = 0,
                .wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,
                .wLength       = sizeof(CDCInterfaceInfo->State.LineEncoding),
                .wValue        = 0,
                .wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,
                .wLength       = sizeof(CDCInterfaceInfo->State.LineEncoding),


@@ -255,7 +255,7 @@ uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* const CDCI
        USB_ControlRequest = (USB_Request_Header_t)
        {
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
        USB_ControlRequest = (USB_Request_Header_t)
        {
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),

-               .bRequest      = REQ_SetControlLineState,
+               .bRequest      = CDC_REQ_SetControlLineState,

                .wValue        = CDCInterfaceInfo->State.ControlLineStates.HostToDevice,
                .wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,
                .wLength       = 0,
                .wValue        = CDCInterfaceInfo->State.ControlLineStates.HostToDevice,
                .wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,
                .wLength       = 0,


@@ -272,7 +272,7 @@ uint8_t CDC_Host_SendBreak(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
        USB_ControlRequest = (USB_Request_Header_t)
        {
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
        USB_ControlRequest = (USB_Request_Header_t)
        {
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),

-               .bRequest      = REQ_SendBreak,
+               .bRequest      = CDC_REQ_SendBreak,

                .wValue        = Duration,
                .wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,
                .wLength       = 0,
                .wValue        = Duration,
                .wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,
                .wLength       = 0,