X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/5a4def747897c1c6ffbe465506d846c7c686d3e9..b120c4e4cda5b5ed12a61697b5ab33d4dd0a70e8:/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 57ca35cdc..930416188 100644
--- 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
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
@@ -32,8 +32,8 @@
 #include "../../HighLevel/USBMode.h"
 #if defined(USB_CAN_BE_HOST)
 
-#define  __INCLUDE_FROM_CDC_CLASS_HOST_C
 #define  __INCLUDE_FROM_CDC_DRIVER
+#define  __INCLUDE_FROM_CDC_HOST_C
 #include "CDC.h"
 
 uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
@@ -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);
 
-		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;
 		}
@@ -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);
 
-		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;
 		}
@@ -226,7 +226,9 @@ void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
 
 	Pipe_Freeze();
 
+	#if !defined(NO_CLASS_DRIVER_AUTOFLUSH)
 	CDC_Host_Flush(CDCInterfaceInfo);
+	#endif
 }
 
 uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)