X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/5a4def747897c1c6ffbe465506d846c7c686d3e9..08de757811bb2a17d21a35ca08205b4ed64613ff:/LUFA/Drivers/USB/Class/Host/RNDIS.c?ds=inline

diff --git a/LUFA/Drivers/USB/Class/Host/RNDIS.c b/LUFA/Drivers/USB/Class/Host/RNDIS.c
index 541b7d3d1..3054d7fc1 100644
--- a/LUFA/Drivers/USB/Class/Host/RNDIS.c
+++ b/LUFA/Drivers/USB/Class/Host/RNDIS.c
@@ -32,8 +32,8 @@
 #include "../../HighLevel/USBMode.h"
 #if defined(USB_CAN_BE_HOST)
 
-#define  __INCLUDE_FROM_RNDIS_CLASS_HOST_C
 #define  __INCLUDE_FROM_RNDIS_DRIVER
+#define  __INCLUDE_FROM_RNDIS_HOST_C
 #include "RNDIS.h"
 
 uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
@@ -142,9 +142,9 @@ static uint8_t DCOMP_RNDIS_Host_NextRNDISControlInterface(void* const CurrentDes
 		USB_Descriptor_Interface_t* CurrentInterface = DESCRIPTOR_PCAST(CurrentDescriptor,
 		                                                                USB_Descriptor_Interface_t);
 
-		if ((CurrentInterface->Class    == RNDIS_CONTROL_CLASS)    &&
-		    (CurrentInterface->SubClass == RNDIS_CONTROL_SUBCLASS) &&
-		    (CurrentInterface->Protocol == RNDIS_CONTROL_PROTOCOL))
+		if ((CurrentInterface->Class    == CDC_CSCP_CDCClass)    &&
+		    (CurrentInterface->SubClass == CDC_CSCP_ACMSubclass) &&
+		    (CurrentInterface->Protocol == CDC_CSCP_VendorSpecificProtocol))
 		{
 			return DESCRIPTOR_SEARCH_Found;
 		}
@@ -160,9 +160,9 @@ static uint8_t DCOMP_RNDIS_Host_NextRNDISDataInterface(void* const CurrentDescri
 		USB_Descriptor_Interface_t* CurrentInterface = DESCRIPTOR_PCAST(CurrentDescriptor,
 		                                                                USB_Descriptor_Interface_t);
 
-		if ((CurrentInterface->Class    == RNDIS_DATA_CLASS)    &&
-		    (CurrentInterface->SubClass == RNDIS_DATA_SUBCLASS) &&
-		    (CurrentInterface->Protocol == RNDIS_DATA_PROTOCOL))
+		if ((CurrentInterface->Class    == CDC_CSCP_CDCDataClass)   &&
+		    (CurrentInterface->SubClass == CDC_CSCP_NoDataSubclass) &&
+		    (CurrentInterface->Protocol == CDC_CSCP_NoDataProtocol))
 		{
 			return DESCRIPTOR_SEARCH_Found;
 		}