Cleanups to the Device mode Mass Storage demo applications' SCSI routines.

1 files changed, 23 insertions, 47 deletions

diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c
index 771773bb7..468a04ab7 100644
--- a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c
+++ b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c
@@ -88,34 +88,36 @@ SCSI_Request_Sense_Response_t SenseData =
  */

 bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)

 {

-	bool CommandSuccess = false;

-

+	/* Set initial sense data, before the requested command is processed */

+	SCSI_SET_SENSE(SCSI_SENSE_KEY_GOOD,

+	               SCSI_ASENSE_NO_ADDITIONAL_INFORMATION,

+	               SCSI_ASENSEQ_NO_QUALIFIER);

+					   

 	/* Run the appropriate SCSI command hander function based on the passed command */

 	switch (MSInterfaceInfo->State.CommandBlock.SCSICommandData[0])

 	{

 		case SCSI_CMD_INQUIRY:

-			CommandSuccess = SCSI_Command_Inquiry(MSInterfaceInfo);			

+			SCSI_Command_Inquiry(MSInterfaceInfo);			

 			break;

 		case SCSI_CMD_REQUEST_SENSE:

-			CommandSuccess = SCSI_Command_Request_Sense(MSInterfaceInfo);

+			SCSI_Command_Request_Sense(MSInterfaceInfo);

 			break;

 		case SCSI_CMD_READ_CAPACITY_10:

-			CommandSuccess = SCSI_Command_Read_Capacity_10(MSInterfaceInfo);			

+			SCSI_Command_Read_Capacity_10(MSInterfaceInfo);			

 			break;

 		case SCSI_CMD_SEND_DIAGNOSTIC:

-			CommandSuccess = SCSI_Command_Send_Diagnostic(MSInterfaceInfo);

+			SCSI_Command_Send_Diagnostic(MSInterfaceInfo);

 			break;

 		case SCSI_CMD_WRITE_10:

-			CommandSuccess = SCSI_Command_ReadWrite_10(MSInterfaceInfo, DATA_WRITE);

+			SCSI_Command_ReadWrite_10(MSInterfaceInfo, DATA_WRITE);

 			break;

 		case SCSI_CMD_READ_10:

-			CommandSuccess = SCSI_Command_ReadWrite_10(MSInterfaceInfo, DATA_READ);

+			SCSI_Command_ReadWrite_10(MSInterfaceInfo, DATA_READ);

 			break;

 		case SCSI_CMD_TEST_UNIT_READY:

 		case SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL:

 		case SCSI_CMD_VERIFY_10:

 			/* These commands should just succeed, no handling required */

-			CommandSuccess = true;

 			MSInterfaceInfo->State.CommandBlock.DataTransferLength = 0;

 			break;

 		default:

@@ -126,27 +128,15 @@ bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)
 			break;

 	}

 

-	/* Check if command was successfully processed */

-	if (CommandSuccess)

-	{

-		SCSI_SET_SENSE(SCSI_SENSE_KEY_GOOD,

-		               SCSI_ASENSE_NO_ADDITIONAL_INFORMATION,

-		               SCSI_ASENSEQ_NO_QUALIFIER);

-		

-		return true;

-	}

-

-	return false;

+	return (SenseData.SenseKey == SCSI_SENSE_KEY_GOOD);

 }

 

 /** Command processing for an issued SCSI INQUIRY command. This command returns information about the device's features

  *  and capabilities to the host.

  *

  *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface structure that the command is associated with

- *

- *  \return Boolean true if the command completed successfully, false otherwise.

  */

-static bool SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)

+static void SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)

 {

 	uint16_t AllocationLength  = (((uint16_t)MSInterfaceInfo->State.CommandBlock.SCSICommandData[3] << 8) |

 	                                         MSInterfaceInfo->State.CommandBlock.SCSICommandData[4]);

@@ -162,7 +152,7 @@ static bool SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)
 		               SCSI_ASENSE_INVALID_FIELD_IN_CDB,

 		               SCSI_ASENSEQ_NO_QUALIFIER);

 

-		return false;

+		return;

 	}

 	

 	Endpoint_Write_Stream_LE(&InquiryData, BytesTransferred, NO_STREAM_CALLBACK);

@@ -177,18 +167,14 @@ static bool SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)
 

 	/* Succeed the command and update the bytes transferred counter */

 	MSInterfaceInfo->State.CommandBlock.DataTransferLength -= BytesTransferred;

-	

-	return true;

 }

 

 /** Command processing for an issued SCSI REQUEST SENSE command. This command returns information about the last issued command,

  *  including the error code and additional error information so that the host can determine why a command failed to complete.

  *

  *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface structure that the command is associated with

- *

- *  \return Boolean true if the command completed successfully, false otherwise.

  */

-static bool SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)

+static void SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)

 {

 	uint8_t  AllocationLength = MSInterfaceInfo->State.CommandBlock.SCSICommandData[4];

 	uint8_t  BytesTransferred = (AllocationLength < sizeof(SenseData))? AllocationLength : sizeof(SenseData);

@@ -201,18 +187,14 @@ static bool SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* MSInterfaceInf
 

 	/* Succeed the command and update the bytes transferred counter */

 	MSInterfaceInfo->State.CommandBlock.DataTransferLength -= BytesTransferred;

-

-	return true;

 }

 

 /** Command processing for an issued SCSI READ CAPACITY (10) command. This command returns information about the device's capacity

  *  on the selected Logical Unit (drive), as a number of OS-sized blocks.

  *

  *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface structure that the command is associated with

- *

- *  \return Boolean true if the command completed successfully, false otherwise.

  */

-static bool SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)

+static void SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)

 {

 	uint32_t LastBlockAddressInLUN = (LUN_MEDIA_BLOCKS - 1);

 	uint32_t MediaBlockSize        = VIRTUAL_MEMORY_BLOCK_SIZE;

@@ -223,8 +205,6 @@ static bool SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterface
 	

 	/* Succeed the command and update the bytes transferred counter */

 	MSInterfaceInfo->State.CommandBlock.DataTransferLength -= 8;

-	

-	return true;

 }

 

 /** Command processing for an issued SCSI SEND DIAGNOSTIC command. This command performs a quick check of the Dataflash ICs on the

@@ -232,10 +212,8 @@ static bool SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterface
  *  supported.

  *

  *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface structure that the command is associated with

- *

- *  \return Boolean true if the command completed successfully, false otherwise.

  */

-static bool SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)

+static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)

 {

 	/* Check to see if the SELF TEST bit is not set */

 	if (!(MSInterfaceInfo->State.CommandBlock.SCSICommandData[1] & (1 << 2)))

@@ -245,7 +223,7 @@ static bool SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceI
 		               SCSI_ASENSE_INVALID_FIELD_IN_CDB,

 		               SCSI_ASENSEQ_NO_QUALIFIER);

 

-		return false;

+		return;

 	}

 	

 	/* Check to see if all attached Dataflash ICs are functional */

@@ -256,13 +234,13 @@ static bool SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceI
 		               SCSI_ASENSE_NO_ADDITIONAL_INFORMATION,

 		               SCSI_ASENSEQ_NO_QUALIFIER);	

 	

-		return false;

+		return;

 	}

 	

 	/* Succeed the command and update the bytes transferred counter */

 	MSInterfaceInfo->State.CommandBlock.DataTransferLength = 0;

 	

-	return true;

+	return;

 }

 

 /** Command processing for an issued SCSI READ (10) or WRITE (10) command. This command reads in the block start address

@@ -271,10 +249,8 @@ static bool SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceI
  *

  *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface structure that the command is associated with

  *  \param[in] IsDataRead  Indicates if the command is a READ (10) command or WRITE (10) command (DATA_READ or DATA_WRITE)

- *

- *  \return Boolean true if the command completed successfully, false otherwise.

  */

-static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const bool IsDataRead)

+static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const bool IsDataRead)

 {

 	uint32_t BlockAddress;

 	uint16_t TotalBlocks;

@@ -297,7 +273,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo
 		               SCSI_ASENSE_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE,

 		               SCSI_ASENSEQ_NO_QUALIFIER);

 

-		return false;

+		return;

 	}

 

 	#if (TOTAL_LUNS > 1)

@@ -314,5 +290,5 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo
 	/* Update the bytes transferred counter and succeed the command */

 	MSInterfaceInfo->State.CommandBlock.DataTransferLength -= ((uint32_t)TotalBlocks * VIRTUAL_MEMORY_BLOCK_SIZE);

 	

-	return true;

+	return;

 }