Move RNDISConstants.h into the RNDIS class driver common definition header.

[pub/USBasp.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 28d94e5..9304161 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/CDC.c
+++ b/LUFA/Drivers/USB/Class/Host/CDC.c
@@ -3,7 +3,7 @@
      Copyright (C) Dean Camera, 2010.
 
   dean [at] fourwalledcubicle [dot] com
      Copyright (C) Dean Camera, 2010.
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*


@@ -142,9 +142,9 @@ static uint8_t DCOMP_CDC_Host_NextCDCControlInterface(void* const CurrentDescrip
                USB_Descriptor_Interface_t* CurrentInterface = DESCRIPTOR_PCAST(CurrentDescriptor,
                                                                                USB_Descriptor_Interface_t);
 
                USB_Descriptor_Interface_t* CurrentInterface = DESCRIPTOR_PCAST(CurrentDescriptor,
                                                                                USB_Descriptor_Interface_t);
 

-               if ((CurrentInterface->Class    == CDC_CONTROL_CLASS)    &&
-                   (CurrentInterface->SubClass == CDC_CONTROL_SUBCLASS) &&
-                   (CurrentInterface->Protocol == CDC_CONTROL_PROTOCOL))
+               if ((CurrentInterface->Class    == CDC_CSCP_CDCClass)    &&
+                   (CurrentInterface->SubClass == CDC_CSCP_ACMSubclass) &&
+                   (CurrentInterface->Protocol == CDC_CSCP_ATCommandProtocol))

                {
                        return DESCRIPTOR_SEARCH_Found;
                }
                {
                        return DESCRIPTOR_SEARCH_Found;
                }


@@ -160,9 +160,9 @@ static uint8_t DCOMP_CDC_Host_NextCDCDataInterface(void* const CurrentDescriptor
                USB_Descriptor_Interface_t* CurrentInterface = DESCRIPTOR_PCAST(CurrentDescriptor,
                                                                                USB_Descriptor_Interface_t);
 
                USB_Descriptor_Interface_t* CurrentInterface = DESCRIPTOR_PCAST(CurrentDescriptor,
                                                                                USB_Descriptor_Interface_t);
 

-               if ((CurrentInterface->Class    == CDC_DATA_CLASS)    &&
-                   (CurrentInterface->SubClass == CDC_DATA_SUBCLASS) &&
-                   (CurrentInterface->Protocol == CDC_DATA_PROTOCOL))
+               if ((CurrentInterface->Class    == CDC_CSCP_CDCDataClass)   &&
+                   (CurrentInterface->SubClass == CDC_CSCP_NoDataSubclass) &&
+                   (CurrentInterface->Protocol == CDC_CSCP_NoDataProtocol))

                {
                        return DESCRIPTOR_SEARCH_Found;
                }
                {
                        return DESCRIPTOR_SEARCH_Found;
                }


@@ -226,7 +226,9 @@ void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
 
        Pipe_Freeze();
 
 
        Pipe_Freeze();
 

+       #if !defined(NO_CLASS_DRIVER_AUTOFLUSH)

        CDC_Host_Flush(CDCInterfaceInfo);
        CDC_Host_Flush(CDCInterfaceInfo);

+       #endif

 }
 
 uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
 }
 
 uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)