*/\r
bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
{\r
- bool CommandSuccess = false;\r
-\r
+ /* Set initial sense data, before the requested command is processed */\r
+ SCSI_SET_SENSE(SCSI_SENSE_KEY_GOOD,\r
+ SCSI_ASENSE_NO_ADDITIONAL_INFORMATION,\r
+ SCSI_ASENSEQ_NO_QUALIFIER);\r
+ \r
/* Run the appropriate SCSI command hander function based on the passed command */\r
switch (MSInterfaceInfo->State.CommandBlock.SCSICommandData[0])\r
{\r
case SCSI_CMD_INQUIRY:\r
- CommandSuccess = SCSI_Command_Inquiry(MSInterfaceInfo); \r
+ SCSI_Command_Inquiry(MSInterfaceInfo); \r
break;\r
case SCSI_CMD_REQUEST_SENSE:\r
- CommandSuccess = SCSI_Command_Request_Sense(MSInterfaceInfo);\r
+ SCSI_Command_Request_Sense(MSInterfaceInfo);\r
break;\r
case SCSI_CMD_READ_CAPACITY_10:\r
- CommandSuccess = SCSI_Command_Read_Capacity_10(MSInterfaceInfo); \r
+ SCSI_Command_Read_Capacity_10(MSInterfaceInfo); \r
break;\r
case SCSI_CMD_SEND_DIAGNOSTIC:\r
- CommandSuccess = SCSI_Command_Send_Diagnostic(MSInterfaceInfo);\r
+ SCSI_Command_Send_Diagnostic(MSInterfaceInfo);\r
break;\r
case SCSI_CMD_WRITE_10:\r
- CommandSuccess = SCSI_Command_ReadWrite_10(MSInterfaceInfo, DATA_WRITE);\r
+ SCSI_Command_ReadWrite_10(MSInterfaceInfo, DATA_WRITE);\r
break;\r
case SCSI_CMD_READ_10:\r
- CommandSuccess = SCSI_Command_ReadWrite_10(MSInterfaceInfo, DATA_READ);\r
+ 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
MSInterfaceInfo->State.CommandBlock.DataTransferLength = 0;\r
break;\r
default:\r
break;\r
}\r
\r
- /* Check if command was successfully processed */\r
- if (CommandSuccess)\r
- {\r
- SCSI_SET_SENSE(SCSI_SENSE_KEY_GOOD,\r
- SCSI_ASENSE_NO_ADDITIONAL_INFORMATION,\r
- SCSI_ASENSEQ_NO_QUALIFIER);\r
- \r
- return true;\r
- }\r
-\r
- return false;\r
+ return (SenseData.SenseKey == SCSI_SENSE_KEY_GOOD);\r
}\r
\r
/** Command processing for an issued SCSI INQUIRY command. This command returns information about the device's features\r
* and capabilities to the host.\r
*\r
* \param[in] MSInterfaceInfo Pointer to the Mass Storage class interface structure that the command is associated with\r
- *\r
- * \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
+static void SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
{\r
uint16_t AllocationLength = (((uint16_t)MSInterfaceInfo->State.CommandBlock.SCSICommandData[3] << 8) |\r
MSInterfaceInfo->State.CommandBlock.SCSICommandData[4]);\r
SCSI_ASENSE_INVALID_FIELD_IN_CDB,\r
SCSI_ASENSEQ_NO_QUALIFIER);\r
\r
- return false;\r
+ return;\r
}\r
\r
Endpoint_Write_Stream_LE(&InquiryData, BytesTransferred, NO_STREAM_CALLBACK);\r
\r
/* Succeed the command and update the bytes transferred counter */\r
MSInterfaceInfo->State.CommandBlock.DataTransferLength -= BytesTransferred;\r
- \r
- return true;\r
}\r
\r
/** Command processing for an issued SCSI REQUEST SENSE command. This command returns information about the last issued command,\r
* including the error code and additional error information so that the host can determine why a command failed to complete.\r
*\r
* \param[in] MSInterfaceInfo Pointer to the Mass Storage class interface structure that the command is associated with\r
- *\r
- * \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
+static void SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
{\r
uint8_t AllocationLength = MSInterfaceInfo->State.CommandBlock.SCSICommandData[4];\r
uint8_t BytesTransferred = (AllocationLength < sizeof(SenseData))? AllocationLength : sizeof(SenseData);\r
\r
/* Succeed the command and update the bytes transferred counter */\r
MSInterfaceInfo->State.CommandBlock.DataTransferLength -= BytesTransferred;\r
-\r
- return true;\r
}\r
\r
/** Command processing for an issued SCSI READ CAPACITY (10) command. This command returns information about the device's capacity\r
* on the selected Logical Unit (drive), as a number of OS-sized blocks.\r
*\r
* \param[in] MSInterfaceInfo Pointer to the Mass Storage class interface structure that the command is associated with\r
- *\r
- * \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
+static void SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
{\r
uint32_t LastBlockAddressInLUN = (LUN_MEDIA_BLOCKS - 1);\r
uint32_t MediaBlockSize = VIRTUAL_MEMORY_BLOCK_SIZE;\r
\r
/* Succeed the command and update the bytes transferred counter */\r
MSInterfaceInfo->State.CommandBlock.DataTransferLength -= 8;\r
- \r
- return true;\r
}\r
\r
/** Command processing for an issued SCSI SEND DIAGNOSTIC command. This command performs a quick check of the Dataflash ICs on the\r
* supported.\r
*\r
* \param[in] MSInterfaceInfo Pointer to the Mass Storage class interface structure that the command is associated with\r
- *\r
- * \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
+static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
{\r
/* Check to see if the SELF TEST bit is not set */\r
if (!(MSInterfaceInfo->State.CommandBlock.SCSICommandData[1] & (1 << 2)))\r
SCSI_ASENSE_INVALID_FIELD_IN_CDB,\r
SCSI_ASENSEQ_NO_QUALIFIER);\r
\r
- return false;\r
+ return;\r
}\r
\r
/* Check to see if all attached Dataflash ICs are functional */\r
SCSI_ASENSE_NO_ADDITIONAL_INFORMATION,\r
SCSI_ASENSEQ_NO_QUALIFIER); \r
\r
- return false;\r
+ return;\r
}\r
\r
/* Succeed the command and update the bytes transferred counter */\r
MSInterfaceInfo->State.CommandBlock.DataTransferLength = 0;\r
\r
- return true;\r
+ return;\r
}\r
\r
/** Command processing for an issued SCSI READ (10) or WRITE (10) command. This command reads in the block start address\r
*\r
* \param[in] MSInterfaceInfo Pointer to the Mass Storage class interface structure that the command is associated with\r
* \param[in] IsDataRead Indicates if the command is a READ (10) command or WRITE (10) command (DATA_READ or DATA_WRITE)\r
- *\r
- * \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const bool IsDataRead)\r
+static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const bool IsDataRead)\r
{\r
uint32_t BlockAddress;\r
uint16_t TotalBlocks;\r
SCSI_ASENSE_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE,\r
SCSI_ASENSEQ_NO_QUALIFIER);\r
\r
- return false;\r
+ return;\r
}\r
\r
#if (TOTAL_LUNS > 1)\r
/* Update the bytes transferred counter and succeed the command */\r
MSInterfaceInfo->State.CommandBlock.DataTransferLength -= ((uint32_t)TotalBlocks * VIRTUAL_MEMORY_BLOCK_SIZE);\r
\r
- return true;\r
+ return;\r
}\r
bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
\r
#if defined(INCLUDE_FROM_SCSI_C)\r
- static bool SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
- static bool SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
- static bool SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
- static bool SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
- static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const bool IsDataRead);\r
+ static void SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
+ static void SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
+ static void SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
+ static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
+ static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const bool IsDataRead);\r
#endif\r
\r
#endif\r
/** Main routine to process the SCSI command located in the Command Block Wrapper read from the host. This dispatches\r
* 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
+ * \return Boolean true if the command completed sucessfully, false otherwise\r
*/\r
-void SCSI_DecodeSCSICommand(void)\r
+bool SCSI_DecodeSCSICommand(void)\r
{\r
- bool CommandSuccess = false;\r
+ /* Set initial sense data, before the requested command is processed */\r
+ SCSI_SET_SENSE(SCSI_SENSE_KEY_GOOD,\r
+ SCSI_ASENSE_NO_ADDITIONAL_INFORMATION,\r
+ SCSI_ASENSEQ_NO_QUALIFIER);\r
\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
- CommandSuccess = SCSI_Command_Inquiry(); \r
+ SCSI_Command_Inquiry(); \r
break;\r
case SCSI_CMD_REQUEST_SENSE:\r
- CommandSuccess = SCSI_Command_Request_Sense();\r
+ SCSI_Command_Request_Sense();\r
break;\r
case SCSI_CMD_READ_CAPACITY_10:\r
- CommandSuccess = SCSI_Command_Read_Capacity_10(); \r
+ SCSI_Command_Read_Capacity_10(); \r
break;\r
case SCSI_CMD_SEND_DIAGNOSTIC:\r
- CommandSuccess = SCSI_Command_Send_Diagnostic();\r
+ SCSI_Command_Send_Diagnostic();\r
break;\r
case SCSI_CMD_WRITE_10:\r
- CommandSuccess = SCSI_Command_ReadWrite_10(DATA_WRITE);\r
+ SCSI_Command_ReadWrite_10(DATA_WRITE);\r
break;\r
case SCSI_CMD_READ_10:\r
- CommandSuccess = SCSI_Command_ReadWrite_10(DATA_READ);\r
+ SCSI_Command_ReadWrite_10(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
break;\r
default:\r
break;\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
- }\r
+ return (SenseData.SenseKey == SCSI_SENSE_KEY_GOOD);\r
}\r
\r
/** Command processing for an issued SCSI INQUIRY command. This command returns information about the device's features\r
* and capabilities to the host.\r
- *\r
- * \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Inquiry(void)\r
+static void SCSI_Command_Inquiry(void)\r
{\r
uint16_t AllocationLength = (((uint16_t)CommandBlock.SCSICommandData[3] << 8) |\r
CommandBlock.SCSICommandData[4]);\r
SCSI_ASENSE_INVALID_FIELD_IN_CDB,\r
SCSI_ASENSEQ_NO_QUALIFIER);\r
\r
- return false;\r
+ return;\r
}\r
\r
/* Write the INQUIRY data to the endpoint */\r
\r
/* Succeed the command and update the bytes transferred counter */\r
CommandBlock.DataTransferLength -= BytesTransferred;\r
- \r
- return true;\r
}\r
\r
/** Command processing for an issued SCSI REQUEST SENSE command. This command returns information about the last issued command,\r
* including the error code and additional error information so that the host can determine why a command failed to complete.\r
- *\r
- * \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Request_Sense(void)\r
+static void SCSI_Command_Request_Sense(void)\r
{\r
uint8_t AllocationLength = CommandBlock.SCSICommandData[4];\r
uint8_t BytesTransferred = (AllocationLength < sizeof(SenseData))? AllocationLength : sizeof(SenseData);\r
\r
/* Succeed the command and update the bytes transferred counter */\r
CommandBlock.DataTransferLength -= BytesTransferred;\r
-\r
- return true;\r
}\r
\r
/** Command processing for an issued SCSI READ CAPACITY (10) command. This command returns information about the device's capacity\r
* on the selected Logical Unit (drive), as a number of OS-sized blocks.\r
- *\r
- * \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Read_Capacity_10(void)\r
+static void SCSI_Command_Read_Capacity_10(void)\r
{\r
/* Send the total number of logical blocks in the current LUN */\r
Endpoint_Write_DWord_BE(LUN_MEDIA_BLOCKS - 1);\r
\r
/* Check if the current command is being aborted by the host */\r
if (IsMassStoreReset)\r
- return false;\r
+ return;\r
\r
/* Send the endpoint data packet to the host */\r
Endpoint_ClearIN();\r
\r
/* Succeed the command and update the bytes transferred counter */\r
CommandBlock.DataTransferLength -= 8;\r
- \r
- return true;\r
}\r
\r
/** Command processing for an issued SCSI SEND DIAGNOSTIC command. This command performs a quick check of the Dataflash ICs on the\r
* supported.\r
*\r
* \param[in] MSInterfaceInfo Pointer to the Mass Storage class interface structure that the command is associated with\r
- *\r
- * \return Boolean true if the command completed successfully, false otherwise.\r
*/\r
-static bool SCSI_Command_Send_Diagnostic(void)\r
+static void SCSI_Command_Send_Diagnostic(void)\r
{\r
/* Check to see if the SELF TEST bit is not set */\r
if (!(CommandBlock.SCSICommandData[1] & (1 << 2)))\r
SCSI_ASENSE_INVALID_FIELD_IN_CDB,\r
SCSI_ASENSEQ_NO_QUALIFIER);\r
\r
- return false;\r
+ return;\r
}\r
\r
/* Check to see if all attached Dataflash ICs are functional */\r
SCSI_ASENSE_NO_ADDITIONAL_INFORMATION,\r
SCSI_ASENSEQ_NO_QUALIFIER); \r
\r
- return false;\r
+ return;\r
}\r
\r
/* Succeed the command and update the bytes transferred counter */\r
CommandBlock.DataTransferLength = 0;\r
- \r
- return true;\r
}\r
\r
/** Command processing for an issued SCSI READ (10) or WRITE (10) command. This command reads in the block start address\r
* reading and writing of the data.\r
*\r
* \param[in] IsDataRead Indicates if the command is a READ (10) command or WRITE (10) command (DATA_READ or DATA_WRITE)\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 void SCSI_Command_ReadWrite_10(const bool IsDataRead)\r
{\r
uint32_t BlockAddress;\r
uint16_t TotalBlocks;\r
SCSI_ASENSE_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE,\r
SCSI_ASENSEQ_NO_QUALIFIER);\r
\r
- return false;\r
+ return;\r
}\r
\r
#if (TOTAL_LUNS > 1)\r
\r
/* Update the bytes transferred counter and succeed the command */\r
CommandBlock.DataTransferLength -= ((uint32_t)TotalBlocks * VIRTUAL_MEMORY_BLOCK_SIZE);\r
- \r
- return true;\r
}\r
} SCSI_Request_Sense_Response_t;\r
\r
/* Function Prototypes: */\r
- void SCSI_DecodeSCSICommand(void);\r
+ bool SCSI_DecodeSCSICommand(void);\r
\r
#if defined(INCLUDE_FROM_SCSI_C)\r
- static bool SCSI_Command_Inquiry(void);\r
- static bool SCSI_Command_Request_Sense(void);\r
- static bool SCSI_Command_Read_Capacity_10(void);\r
- static bool SCSI_Command_Send_Diagnostic(void);\r
- static bool SCSI_Command_ReadWrite_10(const bool IsDataRead);\r
+ static void SCSI_Command_Inquiry(void);\r
+ static void SCSI_Command_Request_Sense(void);\r
+ static void SCSI_Command_Read_Capacity_10(void);\r
+ static void SCSI_Command_Send_Diagnostic(void);\r
+ static void SCSI_Command_ReadWrite_10(const bool IsDataRead);\r
#endif\r
\r
#endif\r
if (CommandBlock.Flags & COMMAND_DIRECTION_DATA_IN)\r
Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);\r
\r
- /* Decode the received SCSI command */\r
- SCSI_DecodeSCSICommand();\r
+ /* Decode the received SCSI command, set returned status code */\r
+ CommandStatus.Status = SCSI_DecodeSCSICommand() ? Command_Pass : Command_Fail; \r
\r
/* Load in the CBW tag into the CSW to link them together */\r
CommandStatus.Tag = CommandBlock.Tag;\r
\r
/* Load in the data residue counter into the CSW */\r
CommandStatus.DataTransferResidue = CommandBlock.DataTransferLength;\r
-\r
+ \r
/* Stall the selected data pipe if command failed (if data is still to be transferred) */\r
if ((CommandStatus.Status == Command_Fail) && (CommandStatus.DataTransferResidue))\r
Endpoint_StallTransaction();\r
* <b>Changed:</b>\r
* - Removed mostly useless "TestApp" demo, as it was mainly useful only for checking for sytax errors in the library\r
* - MIDI device demos now receive MIDI events from the host and display note ON messages via the board LEDs\r
+ * - Cleanups to the Device mode Mass Storage demo applications' SCSI routines\r
*\r
* <b>Fixed:</b>\r
* - Fixed PrinterHost demo returning invalid Device ID data when the attached device does not have a\r
* This means that while a build inside a particular demo directory will build only that particular demo, a build stated\r
* from the /Demos/ directory will build all LUFA demo projects sequentially.\r
*\r
- * \subsection SSec_CommandLine Via the Command Line\r
* To build a project from the source via the command line, the command <b>"make all"</b> should be executed from the command line in the directory\r
* of interest. To remove compiled files (including the binary output, all intermediately files and all diagnostic output\r
* files), execute <b>"make clean"</b>. Once a "make all" has been run and no errors were encountered, the resulting binary will\r
* be located in the generated ".HEX" file. If your project makes use of pre-initialized EEPROM variables, the generated ".EEP"\r
* file will contain the project's EEPROM data.\r
- *\r
- * \subsection SSec_AVRStudio Via AVRStudio\r
- * Each demo, project and bootloader contains an AVRStudio project (.aps) which can be used to build each project. Once opened\r
- * in AVRStudio, the project can be built and cleaned using the GUI buttons or menus. Note that the AVRStudio project files make\r
- * use of the external project makefile, thus the procedure for configuring a demo remains the same regardless of the build environment.\r
*/
\ No newline at end of file
projects / pub / USBasp.git / commitdiff