projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 1610e42..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
 /*\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
               \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
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -34,10 +34,8 @@
 #define INCLUDE_FROM_MS_CLASS_HOST_C\r
 #include "MassStorage.h"\r
 \r
 #define INCLUDE_FROM_MS_CLASS_HOST_C\r
 #include "MassStorage.h"\r
 \r
-#warning The Mass Storage Host mode Class driver is currently incomplete and is for preview purposes only.\r
-\r
-uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint16_t ConfigDescriptorLength,\r
-                                                          uint8_t* DeviceConfigDescriptor)\r
+uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint16_t ConfigDescriptorSize,\r
+                                                          void* DeviceConfigDescriptor)\r
 {\r
        uint8_t FoundEndpoints = 0;\r
        \r
 {\r
        uint8_t FoundEndpoints = 0;\r
        \r
@@ -46,23 +44,18 @@ uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint16_
        if (DESCRIPTOR_TYPE(DeviceConfigDescriptor) != DTYPE_Configuration)\r
          return MS_ENUMERROR_InvalidConfigDescriptor;\r
        \r
        if (DESCRIPTOR_TYPE(DeviceConfigDescriptor) != DTYPE_Configuration)\r
          return MS_ENUMERROR_InvalidConfigDescriptor;\r
        \r
-       if (USB_GetNextDescriptorComp(&ConfigDescriptorLength, &DeviceConfigDescriptor,\r
-                                     DComp_NextMassStorageInterface) != DESCRIPTOR_SEARCH_COMP_Found)\r
+       if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &DeviceConfigDescriptor,\r
+                                     DComp_NextMSInterface) != DESCRIPTOR_SEARCH_COMP_Found)\r
        {\r
                return MS_ENUMERROR_NoMSInterfaceFound;\r
        }\r
 \r
        {\r
                return MS_ENUMERROR_NoMSInterfaceFound;\r
        }\r
 \r
-       MSInterfaceInfo->State.InterfaceNumber       =\r
-       #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\r
-                            DESCRIPTOR_PCAST(DeviceConfigDescriptor, USB_Descriptor_Interface_t)->InterfaceNumber;\r
-       #else\r
-                            DESCRIPTOR_PCAST(DeviceConfigDescriptor, USB_Descriptor_Interface_t)->bInterfaceNumber;\r
-       #endif\r
+       MSInterfaceInfo->State.InterfaceNumber = DESCRIPTOR_PCAST(DeviceConfigDescriptor, USB_Descriptor_Interface_t)->InterfaceNumber;\r
        \r
        while (FoundEndpoints != (MS_FOUND_DATAPIPE_IN | MS_FOUND_DATAPIPE_OUT))\r
        {\r
        \r
        while (FoundEndpoints != (MS_FOUND_DATAPIPE_IN | MS_FOUND_DATAPIPE_OUT))\r
        {\r
-               if (USB_GetNextDescriptorComp(&ConfigDescriptorLength, &DeviceConfigDescriptor,\r
-                                             DComp_NextInterfaceBulkDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
+               if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &DeviceConfigDescriptor,\r
+                                             DComp_NextMSInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
                {\r
                        return MS_ENUMERROR_EndpointsNotFound;\r
                }\r
                {\r
                        return MS_ENUMERROR_EndpointsNotFound;\r
                }\r
@@ -73,7 +66,7 @@ uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint16_
                {\r
                        Pipe_ConfigurePipe(MSInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_IN,\r
                                           EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
                {\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
                        MSInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
 \r
                        FoundEndpoints |= MS_FOUND_DATAPIPE_IN;\r
@@ -82,24 +75,27 @@ uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint16_
                {\r
                        Pipe_ConfigurePipe(MSInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
                                           EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
                {\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
                }               \r
        }\r
 \r
                        MSInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
 \r
                        FoundEndpoints |= MS_FOUND_DATAPIPE_OUT;\r
                }               \r
        }\r
 \r
-       MSInterfaceInfo->State.Active = true;\r
+       MSInterfaceInfo->State.IsActive = true;\r
        return MS_ENUMERROR_NoError;\r
 }\r
 \r
        return MS_ENUMERROR_NoError;\r
 }\r
 \r
-static uint8_t DComp_NextMassStorageInterface(void* CurrentDescriptor)\r
+static uint8_t DComp_NextMSInterface(void* const CurrentDescriptor)\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r
-               if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class    == MASS_STORE_CLASS)    &&\r
-                   (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).SubClass == MASS_STORE_SUBCLASS) &&\r
-                   (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == MASS_STORE_PROTOCOL))\r
+               USB_Descriptor_Interface_t* CurrentInterface = DESCRIPTOR_PCAST(CurrentDescriptor,\r
+                                                                               USB_Descriptor_Interface_t);\r
+\r
+               if ((CurrentInterface->Class    == MASS_STORE_CLASS)    &&\r
+                   (CurrentInterface->SubClass == MASS_STORE_SUBCLASS) &&\r
+                   (CurrentInterface->Protocol == MASS_STORE_PROTOCOL))\r
                {\r
                        return DESCRIPTOR_SEARCH_Found;\r
                }\r
                {\r
                        return DESCRIPTOR_SEARCH_Found;\r
                }\r
@@ -108,15 +104,20 @@ static uint8_t DComp_NextMassStorageInterface(void* CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
-static uint8_t DComp_NextInterfaceBulkDataEndpoint(void* CurrentDescriptor)\r
+static uint8_t DComp_NextMSInterfaceEndpoint(void* const CurrentDescriptor)\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
        {\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
        {\r
-               uint8_t EndpointType = (DESCRIPTOR_CAST(CurrentDescriptor,\r
-                                                       USB_Descriptor_Endpoint_t).Attributes & EP_TYPE_MASK);\r
+               USB_Descriptor_Endpoint_t* CurrentEndpoint = DESCRIPTOR_PCAST(CurrentDescriptor,\r
+                                                                             USB_Descriptor_Endpoint_t);\r
+\r
+               uint8_t EndpointType = (CurrentEndpoint->Attributes & EP_TYPE_MASK);\r
 \r
 \r
-               if (EndpointType == EP_TYPE_BULK)\r
-                 return DESCRIPTOR_SEARCH_Found;\r
+               if ((EndpointType == EP_TYPE_BULK) &&\r
+                   (!(Pipe_IsEndpointBound(CurrentEndpoint->EndpointAddress))))\r
+               {\r
+                       return DESCRIPTOR_SEARCH_Found;\r
+               }\r
        }\r
        else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r
        }\r
        else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r
@@ -126,33 +127,39 @@ static uint8_t DComp_NextInterfaceBulkDataEndpoint(void* CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
-void MS_Host_USBTask(USB_ClassInfo_MS_Host_t* MSInterfaceInfo)\r
-{\r
-       \r
-}\r
-\r
-static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, MS_CommandBlockWrapper_t* SCSICommandBlock)\r
+static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, MS_CommandBlockWrapper_t* const SCSICommandBlock,\r
+                                   void* BufferPtr)\r
 {\r
        uint8_t ErrorCode = PIPE_RWSTREAM_NoError;\r
 \r
 {\r
        uint8_t ErrorCode = PIPE_RWSTREAM_NoError;\r
 \r
-       if (++MSInterfaceInfo->State.TransactionTag == 0xFFFFFFFF)\r
+       SCSICommandBlock->Tag = ++MSInterfaceInfo->State.TransactionTag;\r
+\r
+       if (MSInterfaceInfo->State.TransactionTag == 0xFFFFFFFF)\r
          MSInterfaceInfo->State.TransactionTag = 1;\r
 \r
        Pipe_SelectPipe(MSInterfaceInfo->Config.DataOUTPipeNumber);\r
        Pipe_Unfreeze();\r
 \r
          MSInterfaceInfo->State.TransactionTag = 1;\r
 \r
        Pipe_SelectPipe(MSInterfaceInfo->Config.DataOUTPipeNumber);\r
        Pipe_Unfreeze();\r
 \r
-       if ((ErrorCode = Pipe_Write_Stream_LE(SCSICommandBlock, sizeof(MS_CommandBlockWrapper_t))) != PIPE_RWSTREAM_NoError)\r
+       if ((ErrorCode = Pipe_Write_Stream_LE(SCSICommandBlock, sizeof(MS_CommandBlockWrapper_t),\r
+                                             NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
          return ErrorCode;\r
 \r
        Pipe_ClearOUT();\r
          return ErrorCode;\r
 \r
        Pipe_ClearOUT();\r
-       while(!(Pipe_IsOUTReady()));\r
+       Pipe_WaitUntilReady();\r
 \r
        Pipe_Freeze();\r
 \r
        Pipe_Freeze();\r
+\r
+       if ((BufferPtr != NULL) &&\r
+           ((ErrorCode = MS_Host_SendReceiveData(MSInterfaceInfo, SCSICommandBlock, BufferPtr)) != PIPE_RWSTREAM_NoError))\r
+       {\r
+               Pipe_Freeze();\r
+               return ErrorCode;\r
+       }\r
        \r
        \r
-       return PIPE_RWSTREAM_NoError;\r
+       return ErrorCode;\r
 }\r
 \r
 }\r
 \r
-static uint8_t MS_Host_WaitForDataReceived(USB_ClassInfo_MS_Host_t* MSInterfaceInfo)\r
+static uint8_t MS_Host_WaitForDataReceived(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)\r
 {\r
        uint16_t TimeoutMSRem = COMMAND_DATA_TIMEOUT_MS;\r
 \r
 {\r
        uint16_t TimeoutMSRem = COMMAND_DATA_TIMEOUT_MS;\r
 \r
@@ -205,18 +212,24 @@ static uint8_t MS_Host_WaitForDataReceived(USB_ClassInfo_MS_Host_t* MSInterfaceI
        return PIPE_RWSTREAM_NoError;\r
 }\r
 \r
        return PIPE_RWSTREAM_NoError;\r
 }\r
 \r
-static uint8_t MS_Host_SendReceiveData(USB_ClassInfo_MS_Host_t* MSInterfaceInfo,\r
-                                         MS_CommandBlockWrapper_t* SCSICommandBlock, void* BufferPtr)\r
+static uint8_t MS_Host_SendReceiveData(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,\r
+                                       MS_CommandBlockWrapper_t* const SCSICommandBlock, void* BufferPtr)\r
 {\r
        uint8_t  ErrorCode = PIPE_RWSTREAM_NoError;\r
        uint16_t BytesRem  = SCSICommandBlock->DataTransferLength;\r
 \r
        if (SCSICommandBlock->Flags & COMMAND_DIRECTION_DATA_IN)\r
        {\r
 {\r
        uint8_t  ErrorCode = PIPE_RWSTREAM_NoError;\r
        uint16_t BytesRem  = SCSICommandBlock->DataTransferLength;\r
 \r
        if (SCSICommandBlock->Flags & COMMAND_DIRECTION_DATA_IN)\r
        {\r
+               if ((ErrorCode = MS_Host_WaitForDataReceived(MSInterfaceInfo)) != PIPE_RWSTREAM_NoError)\r
+               {\r
+                       Pipe_Freeze();\r
+                       return ErrorCode;\r
+               }\r
+\r
                Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipeNumber);\r
                Pipe_Unfreeze();\r
                \r
                Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipeNumber);\r
                Pipe_Unfreeze();\r
                \r
-               if ((ErrorCode = Pipe_Read_Stream_LE(BufferPtr, BytesRem)) != PIPE_RWSTREAM_NoError)\r
+               if ((ErrorCode = Pipe_Read_Stream_LE(BufferPtr, BytesRem, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
                  return ErrorCode;\r
 \r
                Pipe_ClearIN();\r
                  return ErrorCode;\r
 \r
                Pipe_ClearIN();\r
@@ -226,7 +239,7 @@ static uint8_t MS_Host_SendReceiveData(USB_ClassInfo_MS_Host_t* MSInterfaceInfo,
                Pipe_SelectPipe(MSInterfaceInfo->Config.DataOUTPipeNumber);\r
                Pipe_Unfreeze();\r
 \r
                Pipe_SelectPipe(MSInterfaceInfo->Config.DataOUTPipeNumber);\r
                Pipe_Unfreeze();\r
 \r
-               if ((ErrorCode = Pipe_Write_Stream_LE(BufferPtr, BytesRem)) != PIPE_RWSTREAM_NoError)\r
+               if ((ErrorCode = Pipe_Write_Stream_LE(BufferPtr, BytesRem, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
                  return ErrorCode;\r
 \r
                Pipe_ClearOUT();\r
                  return ErrorCode;\r
 \r
                Pipe_ClearOUT();\r
@@ -240,11 +253,11 @@ static uint8_t MS_Host_SendReceiveData(USB_ClassInfo_MS_Host_t* MSInterfaceInfo,
 \r
        Pipe_Freeze();\r
 \r
 \r
        Pipe_Freeze();\r
 \r
-       return PIPE_RWSTREAM_NoError;\r
+       return ErrorCode;\r
 }\r
 \r
 }\r
 \r
-static uint8_t MS_Host_GetReturnedStatus(USB_ClassInfo_MS_Host_t* MSInterfaceInfo,\r
-                                           MS_CommandStatusWrapper_t* SCSICommandStatus)\r
+static uint8_t MS_Host_GetReturnedStatus(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,\r
+                                         MS_CommandStatusWrapper_t* const SCSICommandStatus)\r
 {\r
        uint8_t ErrorCode = PIPE_RWSTREAM_NoError;\r
 \r
 {\r
        uint8_t ErrorCode = PIPE_RWSTREAM_NoError;\r
 \r
@@ -254,20 +267,23 @@ static uint8_t MS_Host_GetReturnedStatus(USB_ClassInfo_MS_Host_t* MSInterfaceInf
        Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipeNumber);\r
        Pipe_Unfreeze();\r
        \r
        Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipeNumber);\r
        Pipe_Unfreeze();\r
        \r
-       if ((ErrorCode = Pipe_Read_Stream_LE(&SCSICommandStatus, sizeof(MS_CommandStatusWrapper_t))) != PIPE_RWSTREAM_NoError)\r
-         return ErrorCode;\r
-         \r
+       if ((ErrorCode = Pipe_Read_Stream_LE(SCSICommandStatus, sizeof(MS_CommandStatusWrapper_t),\r
+                                            NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
+       {\r
+               return ErrorCode;\r
+       }\r
+       \r
        Pipe_ClearIN();\r
        Pipe_Freeze();\r
        \r
        Pipe_ClearIN();\r
        Pipe_Freeze();\r
        \r
-       return PIPE_RWSTREAM_NoError;\r
+       if (SCSICommandStatus->Status != SCSI_Command_Pass)\r
+         ErrorCode = MS_ERROR_LOGICAL_CMD_FAILED;\r
+       \r
+       return ErrorCode;\r
 }\r
 \r
 }\r
 \r
-uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* MSInterfaceInfo)\r
+uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)\r
 {\r
 {\r
-       if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.Active))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
-\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
@@ -282,12 +298,9 @@ uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* MSInterfaceInfo)
        return USB_Host_SendControlRequest(NULL);\r
 }\r
 \r
        return USB_Host_SendControlRequest(NULL);\r
 }\r
 \r
-uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint8_t* MaxLUNIndex)\r
+uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint8_t* const MaxLUNIndex)\r
 {\r
 {\r
-       if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.Active))\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
 \r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
@@ -300,27 +313,26 @@ uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint8_t* Max
                \r
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
 \r
                \r
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
 \r
-       if ((ErrorCode = USB_Host_SendControlRequest(MaxLUNIndex)) == HOST_SENDCONTROL_SetupStalled)\r
+       if ((ErrorCode = USB_Host_SendControlRequest(MaxLUNIndex)) != HOST_SENDCONTROL_Successful)\r
        {\r
        {\r
-               Pipe_ClearStall();\r
-\r
                *MaxLUNIndex = 0;\r
                *MaxLUNIndex = 0;\r
+               ErrorCode = HOST_SENDCONTROL_Successful;\r
        }\r
        \r
        return ErrorCode;\r
 }\r
 \r
        }\r
        \r
        return ErrorCode;\r
 }\r
 \r
-uint8_t MS_Host_GetInquiryData(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint8_t LUNIndex, SCSI_Inquiry_Response_t* InquiryData)\r
+uint8_t MS_Host_GetInquiryData(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, const uint8_t LUNIndex,\r
+                               SCSI_Inquiry_Response_t* const InquiryData)\r
 {\r
 {\r
-       if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.Active))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
          \r
          \r
-       uint8_t ErrorCode = PIPE_RWSTREAM_NoError;\r
+       uint8_t ErrorCode;\r
 \r
        MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
                {\r
                        .Signature          = CBW_SIGNATURE,\r
 \r
        MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
                {\r
                        .Signature          = CBW_SIGNATURE,\r
-                       .Tag                = MSInterfaceInfo->State.TransactionTag,\r
                        .DataTransferLength = sizeof(SCSI_Inquiry_Response_t),\r
                        .Flags              = COMMAND_DIRECTION_DATA_IN,\r
                        .LUN                = LUNIndex,\r
                        .DataTransferLength = sizeof(SCSI_Inquiry_Response_t),\r
                        .Flags              = COMMAND_DIRECTION_DATA_IN,\r
                        .LUN                = LUNIndex,\r
@@ -328,51 +340,259 @@ uint8_t MS_Host_GetInquiryData(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint8_t
                        .SCSICommandData    =\r
                                {\r
                                        SCSI_CMD_INQUIRY,\r
                        .SCSICommandData    =\r
                                {\r
                                        SCSI_CMD_INQUIRY,\r
+                                       0x00,                            // Reserved\r
+                                       0x00,                            // Reserved\r
+                                       0x00,                            // Reserved\r
+                                       sizeof(SCSI_Inquiry_Response_t), // Allocation Length\r
+                                       0x00                             // Unused (control)\r
+                               }\r
+               };\r
+       \r
+       MS_CommandStatusWrapper_t SCSICommandStatus;\r
+\r
+       if ((ErrorCode = MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, InquiryData)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;     \r
+       \r
+       if ((ErrorCode = MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSICommandStatus)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
+\r
+       return PIPE_RWSTREAM_NoError;\r
+}\r
+\r
+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_DeviceDisconnected;\r
+\r
+       uint8_t ErrorCode;      \r
+\r
+       MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
+               {\r
+                       .Signature          = CBW_SIGNATURE,\r
+                       .DataTransferLength = 0,\r
+                       .Flags              = COMMAND_DIRECTION_DATA_IN,\r
+                       .LUN                = LUNIndex,\r
+                       .SCSICommandLength  = 6,\r
+                       .SCSICommandData    =\r
+                               {\r
+                                       SCSI_CMD_TEST_UNIT_READY,\r
+                                       0x00,                   // Reserved\r
                                        0x00,                   // Reserved\r
                                        0x00,                   // Reserved\r
                                        0x00,                   // Reserved\r
                                        0x00,                   // Reserved\r
                                        0x00,                   // Reserved\r
                                        0x00,                   // Reserved\r
-                                       sizeof(SCSI_Inquiry_Response_t), // Allocation Length\r
                                        0x00                    // Unused (control)\r
                                }\r
                };\r
        \r
                                        0x00                    // Unused (control)\r
                                }\r
                };\r
        \r
-       MassStore_SendCommand(MSInterfaceInfo, &SCSICommandBlock);\r
+       MS_CommandStatusWrapper_t SCSICommandStatus;\r
 \r
 \r
-       if ((ErrorCode = MassStore_WaitForDataReceived()) != PIPE_RWSTREAM_NoError)\r
-       {\r
-               Pipe_Freeze();\r
-               return ErrorCode;\r
-       }\r
+       if ((ErrorCode = MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, NULL)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;     \r
+       \r
+       if ((ErrorCode = MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSICommandStatus)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
 \r
 \r
-       if ((ErrorCode = MassStore_SendReceiveData(MSInterfaceInfo, (uint8_t*)InquiryPtr)) != PIPE_RWSTREAM_NoError)\r
-       {\r
-               Pipe_Freeze();\r
-               return ErrorCode;\r
-       }       \r
+       return PIPE_RWSTREAM_NoError;\r
+}\r
+\r
+uint8_t MS_Host_ReadDeviceCapacity(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, const uint8_t LUNIndex,\r
+                                   SCSI_Capacity_t* const DeviceCapacity)\r
+{\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
+\r
+       uint8_t ErrorCode;\r
+\r
+       MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
+               {\r
+                       .Signature          = CBW_SIGNATURE,\r
+                       .DataTransferLength = sizeof(SCSI_Capacity_t),\r
+                       .Flags              = COMMAND_DIRECTION_DATA_IN,\r
+                       .LUN                = LUNIndex,\r
+                       .SCSICommandLength  = 10,\r
+                       .SCSICommandData    =\r
+                               {\r
+                                       SCSI_CMD_READ_CAPACITY_10,\r
+                                       0x00,                   // Reserved\r
+                                       0x00,                   // MSB of Logical block address\r
+                                       0x00,\r
+                                       0x00,\r
+                                       0x00,                   // LSB of Logical block address\r
+                                       0x00,                   // Reserved\r
+                                       0x00,                   // Reserved\r
+                                       0x00,                   // Partial Medium Indicator\r
+                                       0x00                    // Unused (control)\r
+                               }\r
+               };\r
        \r
        \r
-       if ((ErrorCode = MassStore_GetReturnedStatus(MSInterfaceInfo)) != PIPE_RWSTREAM_NoError)\r
-       {\r
-               Pipe_Freeze();\r
-               return ErrorCode;\r
-       }\r
+       MS_CommandStatusWrapper_t SCSICommandStatus;\r
+\r
+       if ((ErrorCode = MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, DeviceCapacity)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
+\r
+       DeviceCapacity->Blocks    = SwapEndian_32(DeviceCapacity->Blocks);\r
+       DeviceCapacity->BlockSize = SwapEndian_32(DeviceCapacity->BlockSize);\r
        \r
        \r
-       return ErrorCode;\r
+       if ((ErrorCode = MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSICommandStatus)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
+\r
+       return PIPE_RWSTREAM_NoError;\r
 }\r
 \r
 }\r
 \r
-uint8_t MS_Host_TestUnitReady(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint8_t LUNIndex, bool* DeviceReady);\r
+uint8_t MS_Host_RequestSense(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, const uint8_t LUNIndex,\r
+                             SCSI_Request_Sense_Response_t* const SenseData)\r
+{\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
+\r
+       uint8_t ErrorCode;\r
+\r
+       MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
+               {\r
+                       .Signature          = CBW_SIGNATURE,\r
+                       .DataTransferLength = sizeof(SCSI_Request_Sense_Response_t),\r
+                       .Flags              = COMMAND_DIRECTION_DATA_IN,\r
+                       .LUN                = LUNIndex,\r
+                       .SCSICommandLength  = 6,\r
+                       .SCSICommandData    =\r
+                               {\r
+                                       SCSI_CMD_REQUEST_SENSE,\r
+                                       0x00,                                  // Reserved\r
+                                       0x00,                                  // Reserved\r
+                                       0x00,                                  // Reserved\r
+                                       sizeof(SCSI_Request_Sense_Response_t), // Allocation Length\r
+                                       0x00                                   // Unused (control)\r
+                               }\r
+               };\r
+       \r
+       MS_CommandStatusWrapper_t SCSICommandStatus;\r
+\r
+       if ((ErrorCode = MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, SenseData)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
+\r
+       if ((ErrorCode = MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSICommandStatus)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
+\r
+       return PIPE_RWSTREAM_NoError;\r
+}\r
 \r
 \r
-uint8_t MS_Host_ReadDeviceCapacity(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint8_t LUNIndex,\r
-                                   SCSI_Capacity_t* DeviceCapacity);\r
+uint8_t MS_Host_PreventAllowMediumRemoval(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, const uint8_t LUNIndex,\r
+                                          const bool PreventRemoval)\r
+{\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
 \r
 \r
-uint8_t MS_Host_RequestSense(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint8_t LUNIndex,\r
-                             SCSI_Request_Sense_Response_t* SenseData);\r
+       uint8_t ErrorCode;\r
 \r
 \r
-uint8_t MS_Host_PreventAllowMediumRemoval(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint8_t LUNIndex, bool PreventRemoval);                                                     \r
+       MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
+               {\r
+                       .Signature          = CBW_SIGNATURE,\r
+                       .DataTransferLength = 0,\r
+                       .Flags              = COMMAND_DIRECTION_DATA_OUT,\r
+                       .LUN                = LUNIndex,\r
+                       .SCSICommandLength  = 6,\r
+                       .SCSICommandData    =\r
+                               {\r
+                                       SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL,\r
+                                       0x00,                   // Reserved\r
+                                       0x00,                   // Reserved\r
+                                       PreventRemoval,         // Prevent flag\r
+                                       0x00,                   // Reserved\r
+                                       0x00                    // Unused (control)\r
+                               }\r
+               };\r
+       \r
+       MS_CommandStatusWrapper_t SCSICommandStatus;\r
 \r
 \r
-uint8_t MS_Host_ReadDeviceBlocks(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint8_t LUNIndex, uint32_t BlockAddr,\r
-                                 uint8_t Blocks, uint16_t BlockSize, void* BlockBuffer);\r
+       if ((ErrorCode = MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, NULL)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
+       \r
+       if ((ErrorCode = MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSICommandStatus)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
 \r
 \r
-uint8_t MS_Host_WriteDeviceBlocks(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint8_t LUNIndex, uint32_t BlockAddr,\r
-                                  uint8_t Blocks, uint16_t BlockSize, void* BlockBuffer);\r
+       return PIPE_RWSTREAM_NoError;\r
+}\r
+\r
+uint8_t MS_Host_ReadDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, const uint8_t LUNIndex, const uint32_t BlockAddress,\r
+                                 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_DeviceDisconnected;\r
+\r
+       uint8_t ErrorCode;\r
+\r
+       MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
+               {\r
+                       .Signature          = CBW_SIGNATURE,\r
+                       .DataTransferLength = ((uint32_t)Blocks * BlockSize),\r
+                       .Flags              = COMMAND_DIRECTION_DATA_IN,\r
+                       .LUN                = LUNIndex,\r
+                       .SCSICommandLength  = 10,\r
+                       .SCSICommandData    =\r
+                               {\r
+                                       SCSI_CMD_READ_10,\r
+                                       0x00,                   // Unused (control bits, all off)\r
+                                       (BlockAddress >> 24),   // MSB of Block Address\r
+                                       (BlockAddress >> 16),\r
+                                       (BlockAddress >> 8),\r
+                                       (BlockAddress & 0xFF),  // LSB of Block Address\r
+                                       0x00,                   // Unused (reserved)\r
+                                       0x00,                   // MSB of Total Blocks to Read\r
+                                       Blocks,                 // LSB of Total Blocks to Read\r
+                                       0x00                    // Unused (control)\r
+                               }\r
+               };\r
+\r
+       MS_CommandStatusWrapper_t SCSICommandStatus;\r
+\r
+       if ((ErrorCode = MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, BlockBuffer)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
+\r
+       if ((ErrorCode = MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSICommandStatus)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
+\r
+       return PIPE_RWSTREAM_NoError;\r
+}\r
+\r
+uint8_t MS_Host_WriteDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, const uint8_t LUNIndex, const uint32_t BlockAddress,\r
+                                  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_DeviceDisconnected;\r
+\r
+       uint8_t ErrorCode;\r
+\r
+       MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
+               {\r
+                       .Signature          = CBW_SIGNATURE,\r
+                       .DataTransferLength = ((uint32_t)Blocks * BlockSize),\r
+                       .Flags              = COMMAND_DIRECTION_DATA_OUT,\r
+                       .LUN                = LUNIndex,\r
+                       .SCSICommandLength  = 10,\r
+                       .SCSICommandData    =\r
+                               {\r
+                                       SCSI_CMD_WRITE_10,\r
+                                       0x00,                   // Unused (control bits, all off)\r
+                                       (BlockAddress >> 24),   // MSB of Block Address\r
+                                       (BlockAddress >> 16),\r
+                                       (BlockAddress >> 8),\r
+                                       (BlockAddress & 0xFF),  // LSB of Block Address\r
+                                       0x00,                   // Unused (reserved)\r
+                                       0x00,                   // MSB of Total Blocks to Write\r
+                                       Blocks,                 // LSB of Total Blocks to Write\r
+                                       0x00                    // Unused (control)\r
+                               }\r
+               };\r
+\r
+       MS_CommandStatusWrapper_t SCSICommandStatus;\r
+\r
+       if ((ErrorCode = MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, BlockBuffer)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
+       \r
+       if ((ErrorCode = MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSICommandStatus)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
+\r
+       return PIPE_RWSTREAM_NoError;\r
+}\r
 \r
 #endif\r
 \r
 #endif\r
USB isp AVR programmer