* to the appropriate SCSI command handling routine if the issued command is supported by the device, else it returns\r
* a command failure due to a ILLEGAL REQUEST.\r
*/\r
-void SCSI_DecodeSCSICommand(void)\r
+bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_t* MSInterfaceInfo)\r
{\r
bool CommandSuccess = false;\r
\r
/* Run the appropriate SCSI command hander function based on the passed command */\r
- switch (CommandBlock.SCSICommandData[0])\r
+ switch (MSInterfaceInfo->CommandBlock.SCSICommandData[0])\r
{\r
case SCSI_CMD_INQUIRY:\r
- CommandSuccess = SCSI_Command_Inquiry(); \r
+ CommandSuccess = SCSI_Command_Inquiry(MSInterfaceInfo); \r
break;\r
case SCSI_CMD_REQUEST_SENSE:\r
- CommandSuccess = SCSI_Command_Request_Sense();\r
+ CommandSuccess = SCSI_Command_Request_Sense(MSInterfaceInfo);\r
break;\r
case SCSI_CMD_READ_CAPACITY_10:\r
- CommandSuccess = SCSI_Command_Read_Capacity_10(); \r
+ CommandSuccess = SCSI_Command_Read_Capacity_10(MSInterfaceInfo); \r
break;\r
case SCSI_CMD_SEND_DIAGNOSTIC:\r
- CommandSuccess = SCSI_Command_Send_Diagnostic();\r
+ CommandSuccess = SCSI_Command_Send_Diagnostic(MSInterfaceInfo);\r
break;\r
case SCSI_CMD_WRITE_10:\r
- CommandSuccess = SCSI_Command_ReadWrite_10(DATA_WRITE);\r
+ CommandSuccess = SCSI_Command_ReadWrite_10(MSInterfaceInfo, DATA_WRITE);\r
break;\r
case SCSI_CMD_READ_10:\r
- CommandSuccess = SCSI_Command_ReadWrite_10(DATA_READ);\r
+ CommandSuccess = SCSI_Command_ReadWrite_10(MSInterfaceInfo, DATA_READ);\r
break;\r
case SCSI_CMD_TEST_UNIT_READY:\r
case SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL:\r
case SCSI_CMD_VERIFY_10:\r
/* These commands should just succeed, no handling required */\r
CommandSuccess = true;\r
- CommandBlock.DataTransferLength = 0;\r
+ MSInterfaceInfo->CommandBlock.DataTransferLength = 0;\r
break;\r
default:\r
/* Update the SENSE key to reflect the invalid command */\r
SCSI_ASENSEQ_NO_QUALIFIER);\r
break;\r
}\r
- \r
+\r
/* Check if command was successfully processed */\r
if (CommandSuccess)\r
{\r
- /* Command succeeded - set the CSW status and update the SENSE key */\r
- CommandStatus.Status = Command_Pass;\r
- \r
SCSI_SET_SENSE(SCSI_SENSE_KEY_GOOD,\r
SCSI_ASENSE_NO_ADDITIONAL_INFORMATION,\r
- SCSI_ASENSEQ_NO_QUALIFIER); \r
- }\r
- else\r
- {\r
- /* Command failed - set the CSW status - failed command function updates the SENSE key */\r
- CommandStatus.Status = Command_Fail;\r
+ SCSI_ASENSEQ_NO_QUALIFIER);\r
+ \r
+ return true;\r
}\r
+\r
+ return false;\r
}\r
\r
/** Command processing for an issued SCSI INQUIRY command. This command returns information about the device's features\r
*\r
* \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Inquiry(void)\r
+static bool SCSI_Command_Inquiry(USB_ClassInfo_MS_t* MSInterfaceInfo)\r
{\r
- uint16_t AllocationLength = (((uint16_t)CommandBlock.SCSICommandData[3] << 8) |\r
- CommandBlock.SCSICommandData[4]);\r
+ uint16_t AllocationLength = (((uint16_t)MSInterfaceInfo->CommandBlock.SCSICommandData[3] << 8) |\r
+ MSInterfaceInfo->CommandBlock.SCSICommandData[4]);\r
uint16_t BytesTransferred = (AllocationLength < sizeof(InquiryData))? AllocationLength :\r
sizeof(InquiryData);\r
\r
/* Only the standard INQUIRY data is supported, check if any optional INQUIRY bits set */\r
- if ((CommandBlock.SCSICommandData[1] & ((1 << 0) | (1 << 1))) ||\r
- CommandBlock.SCSICommandData[2])\r
+ if ((MSInterfaceInfo->CommandBlock.SCSICommandData[1] & ((1 << 0) | (1 << 1))) ||\r
+ MSInterfaceInfo->CommandBlock.SCSICommandData[2])\r
{\r
/* Optional but unsupported bits set - update the SENSE key and fail the request */\r
SCSI_SET_SENSE(SCSI_SENSE_KEY_ILLEGAL_REQUEST,\r
\r
return false;\r
}\r
-\r
- /* Write the INQUIRY data to the endpoint */\r
- Endpoint_Write_Stream_LE(&InquiryData, BytesTransferred, StreamCallback_AbortOnMassStoreReset);\r
+ \r
+ Endpoint_Write_Stream_LE(&InquiryData, BytesTransferred, NO_STREAM_CALLBACK);\r
\r
uint8_t PadBytes[AllocationLength - BytesTransferred];\r
\r
/* Pad out remaining bytes with 0x00 */\r
- Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), StreamCallback_AbortOnMassStoreReset);\r
+ Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), NO_STREAM_CALLBACK);\r
\r
/* Finalize the stream transfer to send the last packet */\r
Endpoint_ClearIN();\r
\r
/* Succeed the command and update the bytes transferred counter */\r
- CommandBlock.DataTransferLength -= BytesTransferred;\r
+ MSInterfaceInfo->CommandBlock.DataTransferLength -= BytesTransferred;\r
\r
return true;\r
}\r
*\r
* \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Request_Sense(void)\r
+static bool SCSI_Command_Request_Sense(USB_ClassInfo_MS_t* MSInterfaceInfo)\r
{\r
- uint8_t AllocationLength = CommandBlock.SCSICommandData[4];\r
+ uint8_t AllocationLength = MSInterfaceInfo->CommandBlock.SCSICommandData[4];\r
uint8_t BytesTransferred = (AllocationLength < sizeof(SenseData))? AllocationLength : sizeof(SenseData);\r
\r
- /* Send the SENSE data - this indicates to the host the status of the last command */\r
- Endpoint_Write_Stream_LE(&SenseData, BytesTransferred, StreamCallback_AbortOnMassStoreReset);\r
- \r
uint8_t PadBytes[AllocationLength - BytesTransferred];\r
- \r
- /* Pad out remaining bytes with 0x00 */\r
- Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), StreamCallback_AbortOnMassStoreReset);\r
\r
- /* Finalize the stream transfer to send the last packet */\r
+ Endpoint_Write_Stream_LE(&SenseData, BytesTransferred, NO_STREAM_CALLBACK);\r
+ Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), NO_STREAM_CALLBACK);\r
Endpoint_ClearIN();\r
\r
/* Succeed the command and update the bytes transferred counter */\r
- CommandBlock.DataTransferLength -= BytesTransferred;\r
+ MSInterfaceInfo->CommandBlock.DataTransferLength -= BytesTransferred;\r
\r
return true;\r
}\r
*\r
* \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Read_Capacity_10(void)\r
+static bool SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_t* MSInterfaceInfo)\r
{\r
- /* Send the total number of logical blocks in the current LUN */\r
- Endpoint_Write_DWord_BE(LUN_MEDIA_BLOCKS - 1);\r
+ uint32_t TotalLUNs = (LUN_MEDIA_BLOCKS - 1);\r
+ uint32_t MediaBlockSize = VIRTUAL_MEMORY_BLOCK_SIZE;\r
\r
- /* Send the logical block size of the device (must be 512 bytes) */\r
- Endpoint_Write_DWord_BE(VIRTUAL_MEMORY_BLOCK_SIZE);\r
-\r
- /* Check if the current command is being aborted by the host */\r
- if (IsMassStoreReset)\r
- return false;\r
-\r
- /* Send the endpoint data packet to the host */\r
+ Endpoint_Write_Stream_BE(&TotalLUNs, sizeof(TotalLUNs), NO_STREAM_CALLBACK);\r
+ Endpoint_Write_Stream_BE(&MediaBlockSize, sizeof(MediaBlockSize), NO_STREAM_CALLBACK);\r
Endpoint_ClearIN();\r
-\r
+ \r
/* Succeed the command and update the bytes transferred counter */\r
- CommandBlock.DataTransferLength -= 8;\r
+ MSInterfaceInfo->CommandBlock.DataTransferLength -= 8;\r
\r
return true;\r
}\r
*\r
* \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Send_Diagnostic(void)\r
+static bool SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_t* MSInterfaceInfo)\r
{\r
uint8_t ReturnByte;\r
\r
/* Check to see if the SELF TEST bit is not set */\r
- if (!(CommandBlock.SCSICommandData[1] & (1 << 2)))\r
+ if (!(MSInterfaceInfo->CommandBlock.SCSICommandData[1] & (1 << 2)))\r
{\r
/* Only self-test supported - update SENSE key and fail the command */\r
SCSI_SET_SENSE(SCSI_SENSE_KEY_ILLEGAL_REQUEST,\r
#endif\r
\r
/* Succeed the command and update the bytes transferred counter */\r
- CommandBlock.DataTransferLength = 0;\r
+ MSInterfaceInfo->CommandBlock.DataTransferLength = 0;\r
\r
return true;\r
}\r
*\r
* \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_ReadWrite_10(const bool IsDataRead)\r
+static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_t* MSInterfaceInfo, const bool IsDataRead)\r
{\r
uint32_t BlockAddress;\r
uint16_t TotalBlocks;\r
\r
/* Load in the 32-bit block address (SCSI uses big-endian, so have to do it byte-by-byte) */\r
- ((uint8_t*)&BlockAddress)[3] = CommandBlock.SCSICommandData[2];\r
- ((uint8_t*)&BlockAddress)[2] = CommandBlock.SCSICommandData[3];\r
- ((uint8_t*)&BlockAddress)[1] = CommandBlock.SCSICommandData[4];\r
- ((uint8_t*)&BlockAddress)[0] = CommandBlock.SCSICommandData[5];\r
+ ((uint8_t*)&BlockAddress)[3] = MSInterfaceInfo->CommandBlock.SCSICommandData[2];\r
+ ((uint8_t*)&BlockAddress)[2] = MSInterfaceInfo->CommandBlock.SCSICommandData[3];\r
+ ((uint8_t*)&BlockAddress)[1] = MSInterfaceInfo->CommandBlock.SCSICommandData[4];\r
+ ((uint8_t*)&BlockAddress)[0] = MSInterfaceInfo->CommandBlock.SCSICommandData[5];\r
\r
/* Load in the 16-bit total blocks (SCSI uses big-endian, so have to do it byte-by-byte) */\r
- ((uint8_t*)&TotalBlocks)[1] = CommandBlock.SCSICommandData[7];\r
- ((uint8_t*)&TotalBlocks)[0] = CommandBlock.SCSICommandData[8];\r
+ ((uint8_t*)&TotalBlocks)[1] = MSInterfaceInfo->CommandBlock.SCSICommandData[7];\r
+ ((uint8_t*)&TotalBlocks)[0] = MSInterfaceInfo->CommandBlock.SCSICommandData[8];\r
\r
/* Check if the block address is outside the maximum allowable value for the LUN */\r
if (BlockAddress >= LUN_MEDIA_BLOCKS)\r
\r
#if (TOTAL_LUNS > 1)\r
/* Adjust the given block address to the real media address based on the selected LUN */\r
- BlockAddress += ((uint32_t)CommandBlock.LUN * LUN_MEDIA_BLOCKS);\r
+ BlockAddress += ((uint32_t)MSInterfaceInfo->CommandBlock.LUN * LUN_MEDIA_BLOCKS);\r
#endif\r
\r
/* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */\r
if (IsDataRead == DATA_READ)\r
- DataflashManager_ReadBlocks(BlockAddress, TotalBlocks);\r
+ DataflashManager_ReadBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks);\r
else\r
- DataflashManager_WriteBlocks(BlockAddress, TotalBlocks);\r
+ DataflashManager_WriteBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks);\r
\r
/* Update the bytes transferred counter and succeed the command */\r
- CommandBlock.DataTransferLength -= ((uint32_t)TotalBlocks * VIRTUAL_MEMORY_BLOCK_SIZE);\r
+ MSInterfaceInfo->CommandBlock.DataTransferLength -= ((uint32_t)TotalBlocks * VIRTUAL_MEMORY_BLOCK_SIZE);\r
\r
return true;\r
}\r
projects / pub / USBasp.git / blobdiff