Remove MIDI ClassDriver device demo's accidental inclusion of the unused ADC peripher...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / RNDIS.c

diff --git a/LUFA/Drivers/USB/Class/Host/RNDIS.c b/LUFA/Drivers/USB/Class/Host/RNDIS.c
index f6dcba1..7663b63 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/RNDIS.c
+++ b/LUFA/Drivers/USB/Class/Host/RNDIS.c
@@ -40,27 +40,22 @@ uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfa
                                   uint16_t ConfigDescriptorSize,
                                   void* ConfigDescriptorData)
 {
-       USB_Descriptor_Endpoint_t* DataINEndpoint       = NULL;
-       USB_Descriptor_Endpoint_t* DataOUTEndpoint      = NULL;
-       USB_Descriptor_Endpoint_t* NotificationEndpoint = NULL;
+       USB_Descriptor_Endpoint_t*  DataINEndpoint        = NULL;
+       USB_Descriptor_Endpoint_t*  DataOUTEndpoint       = NULL;
+       USB_Descriptor_Endpoint_t*  NotificationEndpoint  = NULL;
+       USB_Descriptor_Interface_t* RNDISControlInterface = NULL;
 
        memset(&RNDISInterfaceInfo->State, 0x00, sizeof(RNDISInterfaceInfo->State));
 
        if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
          return RNDIS_ENUMERROR_InvalidConfigDescriptor;
 
-       if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-                                     DCOMP_RNDIS_Host_NextRNDISControlInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-       {
-               return RNDIS_ENUMERROR_NoCompatibleInterfaceFound;
-       }
-       
-       RNDISInterfaceInfo->State.ControlInterfaceNumber = DESCRIPTOR_PCAST(ConfigDescriptorData,
-                                                                           USB_Descriptor_Interface_t)->InterfaceNumber;
+       RNDISControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
 
        while (!(DataINEndpoint) || !(DataOUTEndpoint) || !(NotificationEndpoint))
        {
-               if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
+               if (!(RNDISControlInterface) ||
+                   USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
                                              DCOMP_RNDIS_Host_NextRNDISInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
                {
                        if (NotificationEndpoint)
@@ -81,9 +76,8 @@ uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfa
                                {
                                        return RNDIS_ENUMERROR_NoCompatibleInterfaceFound;
                                }
-
-                               RNDISInterfaceInfo->State.ControlInterfaceNumber = DESCRIPTOR_PCAST(ConfigDescriptorData,
-                                                                                                   USB_Descriptor_Interface_t)->InterfaceNumber;
+                               
+                               RNDISControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
 
                                NotificationEndpoint = NULL;
                        }
@@ -111,7 +105,7 @@ uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfa
                if (PipeNum == RNDISInterfaceInfo->Config.DataINPipeNumber)
                {
                        Pipe_ConfigurePipe(PipeNum, EP_TYPE_BULK, PIPE_TOKEN_IN,
-                                                          DataINEndpoint->EndpointAddress, DataINEndpoint->EndpointSize,
+                                          DataINEndpoint->EndpointAddress, DataINEndpoint->EndpointSize,
                                           RNDISInterfaceInfo->Config.DataINPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);
 
                        RNDISInterfaceInfo->State.DataINPipeSize = DataINEndpoint->EndpointSize;
@@ -135,6 +129,7 @@ uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfa
                }
        }
 
+       RNDISInterfaceInfo->State.ControlInterfaceNumber = RNDISControlInterface->InterfaceNumber;
        RNDISInterfaceInfo->State.IsActive = true;
 
        return RNDIS_ENUMERROR_NoError;
@@ -149,7 +144,7 @@ static uint8_t DCOMP_RNDIS_Host_NextRNDISControlInterface(void* const CurrentDes
        
                if ((CurrentInterface->Class    == RNDIS_CONTROL_CLASS)    &&
                    (CurrentInterface->SubClass == RNDIS_CONTROL_SUBCLASS) &&
-                       (CurrentInterface->Protocol == RNDIS_CONTROL_PROTOCOL))
+                   (CurrentInterface->Protocol == RNDIS_CONTROL_PROTOCOL))
                {
                        return DESCRIPTOR_SEARCH_Found;
                }
@@ -167,7 +162,7 @@ static uint8_t DCOMP_RNDIS_Host_NextRNDISDataInterface(void* const CurrentDescri
        
                if ((CurrentInterface->Class    == RNDIS_DATA_CLASS)    &&
                    (CurrentInterface->SubClass == RNDIS_DATA_SUBCLASS) &&
-                       (CurrentInterface->Protocol == RNDIS_DATA_PROTOCOL))
+                   (CurrentInterface->Protocol == RNDIS_DATA_PROTOCOL))
                {
                        return DESCRIPTOR_SEARCH_Found;
                }
@@ -312,7 +307,7 @@ uint8_t RNDIS_Host_SetRNDISProperty(USB_ClassInfo_RNDIS_Host_t* const RNDISInter
        SetMessageData.SetMessage.MessageType    = REMOTE_NDIS_SET_MSG;
        SetMessageData.SetMessage.MessageLength  = sizeof(RNDIS_Set_Message_t) + Length;
        SetMessageData.SetMessage.RequestId      = RNDISInterfaceInfo->State.RequestID++;
-                       
+       
        SetMessageData.SetMessage.Oid            = Oid;
        SetMessageData.SetMessage.InformationBufferLength = Length;
        SetMessageData.SetMessage.InformationBufferOffset = (sizeof(RNDIS_Set_Message_t) - sizeof(RNDIS_Message_Header_t));
@@ -356,7 +351,7 @@ uint8_t RNDIS_Host_QueryRNDISProperty(USB_ClassInfo_RNDIS_Host_t* const RNDISInt
        QueryMessage.MessageType    = REMOTE_NDIS_QUERY_MSG;
        QueryMessage.MessageLength  = sizeof(RNDIS_Query_Message_t);
        QueryMessage.RequestId      = RNDISInterfaceInfo->State.RequestID++;
-                       
+       
        QueryMessage.Oid            = Oid;
        QueryMessage.InformationBufferLength = 0;
        QueryMessage.InformationBufferOffset = 0;
@@ -432,7 +427,7 @@ uint8_t RNDIS_Host_ReadPacket(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceIn
        
        Pipe_Discard_Stream(DeviceMessage.DataOffset - (sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t)),
                            NO_STREAM_CALLBACK);
-                                               
+       
        Pipe_Read_Stream_LE(Buffer, *PacketLength, NO_STREAM_CALLBACK);
        
        if (!(Pipe_BytesInPipe()))