Replace blind interface descriptor search in the incomplete AndroidAccessoryHost...

[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 15481c7..a75adcc 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/RNDIS.c
+++ b/LUFA/Drivers/USB/Class/Host/RNDIS.c
@@ -29,7 +29,8 @@
 */
 
 #define  __INCLUDE_FROM_USB_DRIVER
 */
 
 #define  __INCLUDE_FROM_USB_DRIVER

-#include "../../HighLevel/USBMode.h"
+#include "../../Core/USBMode.h"
+

 #if defined(USB_CAN_BE_HOST)
 
 #define  __INCLUDE_FROM_RNDIS_DRIVER
 #if defined(USB_CAN_BE_HOST)
 
 #define  __INCLUDE_FROM_RNDIS_DRIVER


@@ -314,7 +315,7 @@ uint8_t RNDIS_Host_InitializeDevice(USB_ClassInfo_RNDIS_Host_t* const RNDISInter
        }
 
        if (InitMessageResponse.Status != REMOTE_NDIS_STATUS_SUCCESS)
        }
 
        if (InitMessageResponse.Status != REMOTE_NDIS_STATUS_SUCCESS)

-         return RNDIS_COMMAND_FAILED;
+         return RNDIS_ERROR_LOGICAL_CMD_FAILED;

 
        RNDISInterfaceInfo->State.DeviceMaxPacketSize = InitMessageResponse.MaxTransferSize;
 
 
        RNDISInterfaceInfo->State.DeviceMaxPacketSize = InitMessageResponse.MaxTransferSize;
 


@@ -360,7 +361,7 @@ uint8_t RNDIS_Host_SetRNDISProperty(USB_ClassInfo_RNDIS_Host_t* const RNDISInter
        }
 
        if (SetMessageResponse.Status != REMOTE_NDIS_STATUS_SUCCESS)
        }
 
        if (SetMessageResponse.Status != REMOTE_NDIS_STATUS_SUCCESS)

-         return RNDIS_COMMAND_FAILED;
+         return RNDIS_ERROR_LOGICAL_CMD_FAILED;

 
        return HOST_SENDCONTROL_Successful;
 }
 
        return HOST_SENDCONTROL_Successful;
 }


@@ -402,7 +403,7 @@ uint8_t RNDIS_Host_QueryRNDISProperty(USB_ClassInfo_RNDIS_Host_t* const RNDISInt
        }
 
        if (QueryMessageResponseData.QueryMessageResponse.Status != REMOTE_NDIS_STATUS_SUCCESS)
        }
 
        if (QueryMessageResponseData.QueryMessageResponse.Status != REMOTE_NDIS_STATUS_SUCCESS)

-         return RNDIS_COMMAND_FAILED;
+         return RNDIS_ERROR_LOGICAL_CMD_FAILED;

 
        memcpy(Buffer, &QueryMessageResponseData.ContiguousBuffer, MaxLength);
 
 
        memcpy(Buffer, &QueryMessageResponseData.ContiguousBuffer, MaxLength);
 


@@ -450,17 +451,18 @@ uint8_t RNDIS_Host_ReadPacket(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceIn
        RNDIS_Packet_Message_t DeviceMessage;
 
        if ((ErrorCode = Pipe_Read_Stream_LE(&DeviceMessage, sizeof(RNDIS_Packet_Message_t),
        RNDIS_Packet_Message_t DeviceMessage;
 
        if ((ErrorCode = Pipe_Read_Stream_LE(&DeviceMessage, sizeof(RNDIS_Packet_Message_t),

-                                            NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)
+                                            NULL)) != PIPE_RWSTREAM_NoError)

        {
                return ErrorCode;
        }
 
        *PacketLength = (uint16_t)DeviceMessage.DataLength;
 
        {
                return ErrorCode;
        }
 
        *PacketLength = (uint16_t)DeviceMessage.DataLength;
 

-       Pipe_Discard_Stream(DeviceMessage.DataOffset - (sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t)),
-                           NO_STREAM_CALLBACK);
+       Pipe_Discard_Stream(DeviceMessage.DataOffset -
+                           (sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t)),
+                           NULL);

 
 

-       Pipe_Read_Stream_LE(Buffer, *PacketLength, NO_STREAM_CALLBACK);
+       Pipe_Read_Stream_LE(Buffer, *PacketLength, NULL);

 
        if (!(Pipe_BytesInPipe()))
          Pipe_ClearIN();
 
        if (!(Pipe_BytesInPipe()))
          Pipe_ClearIN();


@@ -491,12 +493,12 @@ uint8_t RNDIS_Host_SendPacket(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceIn
        Pipe_Unfreeze();
 
        if ((ErrorCode = Pipe_Write_Stream_LE(&DeviceMessage, sizeof(RNDIS_Packet_Message_t),
        Pipe_Unfreeze();
 
        if ((ErrorCode = Pipe_Write_Stream_LE(&DeviceMessage, sizeof(RNDIS_Packet_Message_t),

-                                             NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)
+                                             NULL)) != PIPE_RWSTREAM_NoError)

        {
                return ErrorCode;
        }
 
        {
                return ErrorCode;
        }
 

-       Pipe_Write_Stream_LE(Buffer, PacketLength, NO_STREAM_CALLBACK);
+       Pipe_Write_Stream_LE(Buffer, PacketLength, NULL);

        Pipe_ClearOUT();
 
        Pipe_Freeze();
        Pipe_ClearOUT();
 
        Pipe_Freeze();