Change AVRISP project's timeout to be interrupt based again, but make the interrupt...

[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 ca07175..f148f4e 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


@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+#define  __INCLUDE_FROM_USB_DRIVER\r

 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_HOST)\r
 \r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_HOST)\r
 \r

-#define INCLUDE_FROM_MS_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_MS_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_MS_DRIVER\r

 #include "MassStorage.h"\r
 \r
 uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint16_t ConfigDescriptorSize,\r
 #include "MassStorage.h"\r
 \r
 uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint16_t ConfigDescriptorSize,\r


@@ -127,17 +129,13 @@ static uint8_t DComp_NextMSInterfaceEndpoint(void* const CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
        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
 static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, MS_CommandBlockWrapper_t* const SCSICommandBlock,\r

-                                   void* BufferPtr)\r
+                                   const void* const BufferPtr)\r

 {\r
        uint8_t ErrorCode = PIPE_RWSTREAM_NoError;\r
 \r
 {\r
        uint8_t ErrorCode = PIPE_RWSTREAM_NoError;\r
 \r

-       SCSICommandBlock->Tag = ++MSInterfaceInfo->State.TransactionTag;\r
+       SCSICommandBlock->Signature = CBW_SIGNATURE;\r
+       SCSICommandBlock->Tag       = ++MSInterfaceInfo->State.TransactionTag;\r

 \r
        if (MSInterfaceInfo->State.TransactionTag == 0xFFFFFFFF)\r
          MSInterfaceInfo->State.TransactionTag = 1;\r
 \r
        if (MSInterfaceInfo->State.TransactionTag == 0xFFFFFFFF)\r
          MSInterfaceInfo->State.TransactionTag = 1;\r


@@ -155,7 +153,7 @@ static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInf
        Pipe_Freeze();\r
 \r
        if ((BufferPtr != NULL) &&\r
        Pipe_Freeze();\r
 \r
        if ((BufferPtr != NULL) &&\r

-           ((ErrorCode = MS_Host_SendReceiveData(MSInterfaceInfo, SCSICommandBlock, BufferPtr)) != PIPE_RWSTREAM_NoError))\r
+           ((ErrorCode = MS_Host_SendReceiveData(MSInterfaceInfo, SCSICommandBlock, (void*)BufferPtr)) != PIPE_RWSTREAM_NoError))\r

        {\r
                Pipe_Freeze();\r
                return ErrorCode;\r
        {\r
                Pipe_Freeze();\r
                return ErrorCode;\r


@@ -337,7 +335,6 @@ uint8_t MS_Host_GetInquiryData(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, c
 \r
        MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
                {\r
 \r
        MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
                {\r

-                       .Signature          = CBW_SIGNATURE,\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


@@ -373,7 +370,6 @@ uint8_t MS_Host_TestUnitReady(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, co
 \r
        MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
                {\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
                        .DataTransferLength = 0,\r
                        .Flags              = COMMAND_DIRECTION_DATA_IN,\r
                        .LUN                = LUNIndex,\r


@@ -410,7 +406,6 @@ uint8_t MS_Host_ReadDeviceCapacity(USB_ClassInfo_MS_Host_t* const MSInterfaceInf
 \r
        MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
                {\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
                        .DataTransferLength = sizeof(SCSI_Capacity_t),\r
                        .Flags              = COMMAND_DIRECTION_DATA_IN,\r
                        .LUN                = LUNIndex,\r


@@ -435,8 +430,8 @@ uint8_t MS_Host_ReadDeviceCapacity(USB_ClassInfo_MS_Host_t* const MSInterfaceInf
        if ((ErrorCode = MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, DeviceCapacity)) != PIPE_RWSTREAM_NoError)\r
          return ErrorCode;\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
+       SwapEndian_n(&DeviceCapacity->Blocks,    sizeof(DeviceCapacity->Blocks));\r
+       SwapEndian_n(&DeviceCapacity->BlockSize, sizeof(DeviceCapacity->BlockSize));\r

        \r
        if ((ErrorCode = MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSICommandStatus)) != PIPE_RWSTREAM_NoError)\r
          return ErrorCode;\r
        \r
        if ((ErrorCode = MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSICommandStatus)) != PIPE_RWSTREAM_NoError)\r
          return ErrorCode;\r


@@ -454,7 +449,6 @@ uint8_t MS_Host_RequestSense(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, con
 \r
        MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
                {\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
                        .DataTransferLength = sizeof(SCSI_Request_Sense_Response_t),\r
                        .Flags              = COMMAND_DIRECTION_DATA_IN,\r
                        .LUN                = LUNIndex,\r


@@ -491,7 +485,6 @@ uint8_t MS_Host_PreventAllowMediumRemoval(USB_ClassInfo_MS_Host_t* const MSInter
 \r
        MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
                {\r
 \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
                        .DataTransferLength = 0,\r
                        .Flags              = COMMAND_DIRECTION_DATA_OUT,\r
                        .LUN                = LUNIndex,\r


@@ -528,7 +521,6 @@ uint8_t MS_Host_ReadDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
 \r
        MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
                {\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
                        .DataTransferLength = ((uint32_t)Blocks * BlockSize),\r
                        .Flags              = COMMAND_DIRECTION_DATA_IN,\r
                        .LUN                = LUNIndex,\r


@@ -560,7 +552,7 @@ uint8_t MS_Host_ReadDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
 }\r
 \r
 uint8_t MS_Host_WriteDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, const uint8_t LUNIndex, const uint32_t BlockAddress,\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
+                                  const uint8_t Blocks, const uint16_t BlockSize, const void* BlockBuffer)\r

 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
          return HOST_SENDCONTROL_DeviceDisconnected;\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
          return HOST_SENDCONTROL_DeviceDisconnected;\r


@@ -569,7 +561,6 @@ uint8_t MS_Host_WriteDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo
 \r
        MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
                {\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
                        .DataTransferLength = ((uint32_t)Blocks * BlockSize),\r
                        .Flags              = COMMAND_DIRECTION_DATA_OUT,\r
                        .LUN                = LUNIndex,\r