Add FatFS library to the Webserver project, extend the HTTP server so that it now...

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

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c
index 3251862..7a30263 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -35,7 +35,7 @@
 #include "MassStorage.h"\r
 \r
 uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint16_t ConfigDescriptorSize,\r
-                                                          uint8_t* DeviceConfigDescriptor)\r
+                                                          void* DeviceConfigDescriptor)\r
 {\r
        uint8_t FoundEndpoints = 0;\r
        \r
@@ -66,7 +66,7 @@ uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, u
                {\r
                        Pipe_ConfigurePipe(MSInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_IN,\r
                                           EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
-                                          PIPE_BANK_DOUBLE);\r
+                                          MSInterfaceInfo->Config.DataINPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
                        MSInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
 \r
                        FoundEndpoints |= MS_FOUND_DATAPIPE_IN;\r
@@ -75,7 +75,7 @@ uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, u
                {\r
                        Pipe_ConfigurePipe(MSInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
                                           EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
-                                          PIPE_BANK_DOUBLE);\r
+                                          MSInterfaceInfo->Config.DataOUTPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
                        MSInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
 \r
                        FoundEndpoints |= MS_FOUND_DATAPIPE_OUT;\r
@@ -127,11 +127,6 @@ static uint8_t DComp_NextMSInterfaceEndpoint(void* const CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
-void MS_Host_USBTask(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)\r
-{\r
-       \r
-}\r
-\r
 static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, MS_CommandBlockWrapper_t* const SCSICommandBlock,\r
                                    void* BufferPtr)\r
 {\r
@@ -289,9 +284,6 @@ static uint8_t MS_Host_GetReturnedStatus(USB_ClassInfo_MS_Host_t* const MSInterf
 \r
 uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)\r
 {\r
-       if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
-\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
@@ -308,10 +300,7 @@ uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)
 \r
 uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint8_t* const MaxLUNIndex)\r
 {\r
-       if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
-\r
-       uint8_t ErrorCode;\r
+       uint8_t ErrorCode = HOST_SENDCONTROL_Successful;\r
 \r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
@@ -325,7 +314,10 @@ uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint8_
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
 \r
        if ((ErrorCode = USB_Host_SendControlRequest(MaxLUNIndex)) != HOST_SENDCONTROL_Successful)\r
-         *MaxLUNIndex = 0;\r
+       {\r
+               *MaxLUNIndex = 0;\r
+               ErrorCode = HOST_SENDCONTROL_Successful;\r
+       }\r
        \r
        return ErrorCode;\r
 }\r
@@ -334,7 +326,7 @@ uint8_t MS_Host_GetInquiryData(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, c
                                SCSI_Inquiry_Response_t* const InquiryData)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
          \r
        uint8_t ErrorCode;\r
 \r
@@ -370,7 +362,7 @@ uint8_t MS_Host_GetInquiryData(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, c
 uint8_t MS_Host_TestUnitReady(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, const uint8_t LUNIndex)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
 \r
        uint8_t ErrorCode;      \r
 \r
@@ -407,7 +399,7 @@ uint8_t MS_Host_ReadDeviceCapacity(USB_ClassInfo_MS_Host_t* const MSInterfaceInf
                                    SCSI_Capacity_t* const DeviceCapacity)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
 \r
        uint8_t ErrorCode;\r
 \r
@@ -451,7 +443,7 @@ uint8_t MS_Host_RequestSense(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, con
                              SCSI_Request_Sense_Response_t* const SenseData)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
 \r
        uint8_t ErrorCode;\r
 \r
@@ -488,7 +480,7 @@ uint8_t MS_Host_PreventAllowMediumRemoval(USB_ClassInfo_MS_Host_t* const MSInter
                                           const bool PreventRemoval)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
 \r
        uint8_t ErrorCode;\r
 \r
@@ -525,7 +517,7 @@ uint8_t MS_Host_ReadDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
                                  const uint8_t Blocks, const uint16_t BlockSize, void* BlockBuffer)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
 \r
        uint8_t ErrorCode;\r
 \r
@@ -566,7 +558,7 @@ uint8_t MS_Host_WriteDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo
                                   const uint8_t Blocks, const uint16_t BlockSize, void* BlockBuffer)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
 \r
        uint8_t ErrorCode;\r
 \r