Minor documentation page updates.

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

diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.c b/LUFA/Drivers/USB/Class/Device/MassStorage.c
index 1c41f60..62c5f04 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Device/MassStorage.c
@@ -102,16 +102,16 @@ void USB_MS_USBTask(USB_ClassInfo_MS_t* MSInterfaceInfo)
        {\r
                if (USB_MS_ReadInCommandBlock(MSInterfaceInfo))\r
                {\r
        {\r
                if (USB_MS_ReadInCommandBlock(MSInterfaceInfo))\r
                {\r

-                       if (MSInterfaceInfo->CommandBlock.Flags & COMMAND_DIRECTION_DATA_IN)\r
+                       if (MSInterfaceInfo->CommandBlock.Flags & MS_COMMAND_DIR_DATA_IN)\r

                          Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);\r
                          \r
                        MSInterfaceInfo->CommandStatus.Status              = CALLBACK_USB_MS_SCSICommandReceived(MSInterfaceInfo) ?\r
                          Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);\r
                          \r
                        MSInterfaceInfo->CommandStatus.Status              = CALLBACK_USB_MS_SCSICommandReceived(MSInterfaceInfo) ?\r

-                                                                             Command_Pass : Command_Fail;\r
-                       MSInterfaceInfo->CommandStatus.Signature           = CSW_SIGNATURE;\r
+                                                                             SCSI_Command_Pass : SCSI_Command_Fail;\r
+                       MSInterfaceInfo->CommandStatus.Signature           = MS_CSW_SIGNATURE;\r

                        MSInterfaceInfo->CommandStatus.Tag                 = MSInterfaceInfo->CommandBlock.Tag;\r
                        MSInterfaceInfo->CommandStatus.DataTransferResidue = MSInterfaceInfo->CommandBlock.DataTransferLength;\r
 \r
                        MSInterfaceInfo->CommandStatus.Tag                 = MSInterfaceInfo->CommandBlock.Tag;\r
                        MSInterfaceInfo->CommandStatus.DataTransferResidue = MSInterfaceInfo->CommandBlock.DataTransferLength;\r
 \r

-                       if ((MSInterfaceInfo->CommandStatus.Status == Command_Fail) && (MSInterfaceInfo->CommandStatus.DataTransferResidue))\r
+                       if ((MSInterfaceInfo->CommandStatus.Status == SCSI_Command_Fail) && (MSInterfaceInfo->CommandStatus.DataTransferResidue))\r

                          Endpoint_StallTransaction();\r
                        \r
                        USB_MS_ReturnCommandStatus(MSInterfaceInfo);\r
                          Endpoint_StallTransaction();\r
                        \r
                        USB_MS_ReturnCommandStatus(MSInterfaceInfo);\r


@@ -138,12 +138,12 @@ static bool USB_MS_ReadInCommandBlock(USB_ClassInfo_MS_t* MSInterfaceInfo)
 \r
        CallbackMSInterfaceInfo = MSInterfaceInfo;\r
        Endpoint_Read_Stream_LE(&MSInterfaceInfo->CommandBlock,\r
 \r
        CallbackMSInterfaceInfo = MSInterfaceInfo;\r
        Endpoint_Read_Stream_LE(&MSInterfaceInfo->CommandBlock,\r

-                               (sizeof(CommandBlockWrapper_t) - MAX_SCSI_COMMAND_LENGTH),\r
+                               (sizeof(CommandBlockWrapper_t) - 16),\r

                                StreamCallback_AbortOnMassStoreReset);\r
 \r
                                StreamCallback_AbortOnMassStoreReset);\r
 \r

-       if ((MSInterfaceInfo->CommandBlock.Signature         != CBW_SIGNATURE)              ||\r
+       if ((MSInterfaceInfo->CommandBlock.Signature         != MS_CBW_SIGNATURE)           ||\r

            (MSInterfaceInfo->CommandBlock.LUN               >= MSInterfaceInfo->TotalLUNs) ||\r
            (MSInterfaceInfo->CommandBlock.LUN               >= MSInterfaceInfo->TotalLUNs) ||\r

-               (MSInterfaceInfo->CommandBlock.SCSICommandLength >  MAX_SCSI_COMMAND_LENGTH))\r
+               (MSInterfaceInfo->CommandBlock.SCSICommandLength >  16))\r

        {\r
                Endpoint_StallTransaction();\r
                Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);\r
        {\r
                Endpoint_StallTransaction();\r
                Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);\r