Ensure the library builds cleanly in device mode for architectures lacking multiple...

[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 aae445a..2349757 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/RNDIS.c
+++ b/LUFA/Drivers/USB/Class/Host/RNDIS.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -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


@@ -450,7 +451,7 @@ 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;
        }
        {
                return ErrorCode;
        }


@@ -458,9 +459,9 @@ uint8_t RNDIS_Host_ReadPacket(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceIn
        *PacketLength = (uint16_t)DeviceMessage.DataLength;
 
        Pipe_Discard_Stream(DeviceMessage.DataOffset - (sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t)),
        *PacketLength = (uint16_t)DeviceMessage.DataLength;
 
        Pipe_Discard_Stream(DeviceMessage.DataOffset - (sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t)),

-                           NO_STREAM_CALLBACK);
+                           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 +492,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();