Applied STATIC_ENDPOINT_CONFIGURATION and FIXED_CONTROL_SIZE tokens to all Device...

[pub/USBasp.git] / Demos / Device / MassStorage / SCSI.c

diff --git a/Demos/Device/MassStorage/SCSI.c b/Demos/Device/MassStorage/SCSI.c
index d9c5526..6ddd144 100644 (file)
--- a/Demos/Device/MassStorage/SCSI.c
+++ b/Demos/Device/MassStorage/SCSI.c
@@ -38,36 +38,36 @@
 #define  INCLUDE_FROM_SCSI_C\r
 #include "SCSI.h"\r
 \r
-/** Structure to hold the SCSI reponse data to a SCSI INQUIRY command. This gives information about the device's\r
+/** Structure to hold the SCSI response data to a SCSI INQUIRY command. This gives information about the device's\r
  *  features and capabilities.\r
  */\r
 SCSI_Inquiry_Response_t InquiryData = \r
        {\r
-               DeviceType:          0,\r
-               PeripheralQualifier: 0,\r
+               .DeviceType          = 0,\r
+               .PeripheralQualifier = 0,\r
                        \r
-               Removable:           true,\r
+               .Removable           = true,\r
                        \r
-               Version:             0,\r
+               .Version             = 0,\r
                        \r
-               ResponseDataFormat:  2,\r
-               NormACA:             false,\r
-               TrmTsk:              false,\r
-               AERC:                false,\r
+               .ResponseDataFormat  = 2,\r
+               .NormACA             = false,\r
+               .TrmTsk              = false,\r
+               .AERC                = false,\r
 \r
-               AdditionalLength:    0x1F,\r
+               .AdditionalLength    = 0x1F,\r
                        \r
-               SoftReset:           false,\r
-               CmdQue:              false,\r
-               Linked:              false,\r
-               Sync:                false,\r
-               WideBus16Bit:        false,\r
-               WideBus32Bit:        false,\r
-               RelAddr:             false,\r
+               .SoftReset           = false,\r
+               .CmdQue              = false,\r
+               .Linked              = false,\r
+               .Sync                = false,\r
+               .WideBus16Bit        = false,\r
+               .WideBus32Bit        = false,\r
+               .RelAddr             = false,\r
                \r
-               VendorID:            "LUFA",\r
-               ProductID:           "Dataflash Disk",\r
-               RevisionID:          {'0','.','0','0'},\r
+               .VendorID            = "LUFA",\r
+               .ProductID           = "Dataflash Disk",\r
+               .RevisionID          = {'0','.','0','0'},\r
        };\r
 \r
 /** Structure to hold the sense data for the last issued SCSI command, which is returned to the host after a SCSI REQUEST SENSE\r
@@ -75,8 +75,8 @@ SCSI_Inquiry_Response_t InquiryData =
  */\r
 SCSI_Request_Sense_Response_t SenseData =\r
        {\r
-               ResponseCode:        0x70,\r
-               AdditionalLength:    0x0A,\r
+               .ResponseCode        = 0x70,\r
+               .AdditionalLength    = 0x0A,\r
        };\r
 \r
 \r
@@ -88,7 +88,7 @@ void SCSI_DecodeSCSICommand(void)
 {\r
        bool CommandSuccess = false;\r
 \r
-       /* Run the apropriate SCSI command hander function based on the passed command */\r
+       /* Run the appropriate SCSI command hander function based on the passed command */\r
        switch (CommandBlock.SCSICommandData[0])\r
        {\r
                case SCSI_CMD_INQUIRY:\r
@@ -174,7 +174,7 @@ static bool SCSI_Command_Inquiry(void)
        Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), AbortOnMassStoreReset);\r
 \r
        /* Finalize the stream transfer to send the last packet */\r
-       Endpoint_ClearCurrentBank();\r
+       Endpoint_ClearIN();\r
 \r
        /* Succeed the command and update the bytes transferred counter */\r
        CommandBlock.DataTransferLength -= BytesTransferred;\r
@@ -201,7 +201,7 @@ static bool SCSI_Command_Request_Sense(void)
        Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), AbortOnMassStoreReset);\r
 \r
        /* Finalize the stream transfer to send the last packet */\r
-       Endpoint_ClearCurrentBank();\r
+       Endpoint_ClearIN();\r
 \r
        /* Succeed the command and update the bytes transferred counter */\r
        CommandBlock.DataTransferLength -= BytesTransferred;\r
@@ -227,7 +227,7 @@ static bool SCSI_Command_Read_Capacity_10(void)
          return false;\r
 \r
        /* Send the endpoint data packet to the host */\r
-       Endpoint_ClearCurrentBank();\r
+       Endpoint_ClearIN();\r
 \r
        /* Succeed the command and update the bytes transferred counter */\r
        CommandBlock.DataTransferLength -= 8;\r
@@ -235,7 +235,7 @@ static bool SCSI_Command_Read_Capacity_10(void)
        return true;\r
 }\r
 \r
-/** Command processing for an issued SCSI SEND DIAGNOSTIC command. This command peforms a quick check of the Dataflash ICs on the\r
+/** Command processing for an issued SCSI SEND DIAGNOSTIC command. This command performs a quick check of the Dataflash ICs on the\r
  *  board, and indicates if they are present and functioning correctly. Only the Self-Test portion of the diagnostic command is\r
  *  supported.\r
  *\r