Removed variable axis support from the HID_DESCRIPTOR_JOYSTICK() macro due to OS...

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

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c
index 8a69d15..24b4edc 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

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

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  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


@@ -103,7 +103,7 @@ uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
                        Token           = PIPE_TOKEN_OUT;
                        Type            = EP_TYPE_BULK;
                        DoubleBanked    = MSInterfaceInfo->Config.DataOUTPipeDoubleBank;
                        Token           = PIPE_TOKEN_OUT;
                        Type            = EP_TYPE_BULK;
                        DoubleBanked    = MSInterfaceInfo->Config.DataOUTPipeDoubleBank;

-                       
+

                        MSInterfaceInfo->State.DataOUTPipeSize = DataOUTEndpoint->EndpointSize;
                }
                else
                        MSInterfaceInfo->State.DataOUTPipeSize = DataOUTEndpoint->EndpointSize;
                }
                else


@@ -186,7 +186,7 @@ static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInf
        {
                return ErrorCode;
        }
        {
                return ErrorCode;
        }

-       
+

        Pipe_ClearOUT();
        Pipe_WaitUntilReady();
 
        Pipe_ClearOUT();
        Pipe_WaitUntilReady();
 


@@ -195,14 +195,14 @@ static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInf
        if (BufferPtr != NULL)
        {
                ErrorCode = MS_Host_SendReceiveData(MSInterfaceInfo, SCSICommandBlock, (void*)BufferPtr);
        if (BufferPtr != NULL)
        {
                ErrorCode = MS_Host_SendReceiveData(MSInterfaceInfo, SCSICommandBlock, (void*)BufferPtr);

-               
+

                if ((ErrorCode != PIPE_RWSTREAM_NoError) && (ErrorCode != PIPE_RWSTREAM_PipeStalled))
                {
                        Pipe_Freeze();
                        return ErrorCode;
                }
        }
                if ((ErrorCode != PIPE_RWSTREAM_NoError) && (ErrorCode != PIPE_RWSTREAM_PipeStalled))
                {
                        Pipe_Freeze();
                        return ErrorCode;
                }
        }

-       
+

        MS_CommandStatusWrapper_t SCSIStatusBlock;
        return MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSIStatusBlock);
 }
        MS_CommandStatusWrapper_t SCSIStatusBlock;
        return MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSIStatusBlock);
 }


@@ -348,9 +348,9 @@ uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)
 
        if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
          return ErrorCode;
 
        if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
          return ErrorCode;

-       
+

        Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipeNumber);
        Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipeNumber);

-       
+

        if ((ErrorCode = USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress())) != HOST_SENDCONTROL_Successful)
          return ErrorCode;
 
        if ((ErrorCode = USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress())) != HOST_SENDCONTROL_Successful)
          return ErrorCode;