Use puts_P() and printf_P() instead of the normal variants where possible in the...

[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 4ec0b24..f148f4e 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c
@@ -134,7 +134,8 @@ static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInf
 {\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
@@ -334,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
-                       .Signature          = CBW_SIGNATURE,\r
                        .DataTransferLength = sizeof(SCSI_Inquiry_Response_t),\r
                        .Flags              = COMMAND_DIRECTION_DATA_IN,\r
                        .LUN                = LUNIndex,\r
@@ -370,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
-                       .Signature          = CBW_SIGNATURE,\r
                        .DataTransferLength = 0,\r
                        .Flags              = COMMAND_DIRECTION_DATA_IN,\r
                        .LUN                = LUNIndex,\r
@@ -407,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
-                       .Signature          = CBW_SIGNATURE,\r
                        .DataTransferLength = sizeof(SCSI_Capacity_t),\r
                        .Flags              = COMMAND_DIRECTION_DATA_IN,\r
                        .LUN                = LUNIndex,\r
@@ -432,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
-       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
@@ -451,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
-                       .Signature          = CBW_SIGNATURE,\r
                        .DataTransferLength = sizeof(SCSI_Request_Sense_Response_t),\r
                        .Flags              = COMMAND_DIRECTION_DATA_IN,\r
                        .LUN                = LUNIndex,\r
@@ -488,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
-                       .Signature          = CBW_SIGNATURE,\r
                        .DataTransferLength = 0,\r
                        .Flags              = COMMAND_DIRECTION_DATA_OUT,\r
                        .LUN                = LUNIndex,\r
@@ -525,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
-                       .Signature          = CBW_SIGNATURE,\r
                        .DataTransferLength = ((uint32_t)Blocks * BlockSize),\r
                        .Flags              = COMMAND_DIRECTION_DATA_IN,\r
                        .LUN                = LUNIndex,\r
@@ -566,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
-                       .Signature          = CBW_SIGNATURE,\r
                        .DataTransferLength = ((uint32_t)Blocks * BlockSize),\r
                        .Flags              = COMMAND_DIRECTION_DATA_OUT,\r
                        .LUN                = LUNIndex,\r