diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2009-09-22 07:53:57 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-09-22 07:53:57 +0000 |
commit | 576f40f5aec3d7e48ed949fd24494b6cfb3ec93f (patch) | |
tree | b177b7ca2be074037ba8bf68ac7b3ee6b3b01a82 /Demos/Device/LowLevel/MassStorage/Lib/SCSI.c | |
parent | 242303c1607fca405d9407b9fab6fb78cae676e2 (diff) | |
download | lufa-576f40f5aec3d7e48ed949fd24494b6cfb3ec93f.tar.gz lufa-576f40f5aec3d7e48ed949fd24494b6cfb3ec93f.tar.bz2 lufa-576f40f5aec3d7e48ed949fd24494b6cfb3ec93f.zip |
Move Dataflash operational checking code out from SCSI.c into the DataflashManager.c in the Device mode Mass Storage demos.
Diffstat (limited to 'Demos/Device/LowLevel/MassStorage/Lib/SCSI.c')
-rw-r--r-- | Demos/Device/LowLevel/MassStorage/Lib/SCSI.c | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c index 53d773ffb..d0840d36e 100644 --- a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c +++ b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c @@ -239,12 +239,12 @@ static bool SCSI_Command_Read_Capacity_10(void) * board, and indicates if they are present and functioning correctly. Only the Self-Test portion of the diagnostic command is
* 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(void)
{
- uint8_t ReturnByte;
-
/* Check to see if the SELF TEST bit is not set */
if (!(CommandBlock.SCSICommandData[1] & (1 << 2)))
{
@@ -256,14 +256,8 @@ static bool SCSI_Command_Send_Diagnostic(void) return false;
}
- /* Test first Dataflash IC is present and responding to commands */
- Dataflash_SelectChip(DATAFLASH_CHIP1);
- Dataflash_SendByte(DF_CMD_READMANUFACTURERDEVICEINFO);
- ReturnByte = Dataflash_ReceiveByte();
- Dataflash_DeselectChip();
-
- /* If returned data is invalid, fail the command */
- if (ReturnByte != DF_MANUFACTURER_ATMEL)
+ /* Check to see if all attached Dataflash ICs are functional */
+ if (!(DataflashManager_CheckDataflashOperation()))
{
/* Update SENSE key with a hardware error condition and return command fail */
SCSI_SET_SENSE(SCSI_SENSE_KEY_HARDWARE_ERROR,
@@ -272,25 +266,6 @@ static bool SCSI_Command_Send_Diagnostic(void) return false;
}
-
- #if (DATAFLASH_TOTALCHIPS == 2)
- /* Test second Dataflash IC is present and responding to commands */
- Dataflash_SelectChip(DATAFLASH_CHIP2);
- Dataflash_SendByte(DF_CMD_READMANUFACTURERDEVICEINFO);
- ReturnByte = Dataflash_ReceiveByte();
- Dataflash_DeselectChip();
-
- /* If returned data is invalid, fail the command */
- if (ReturnByte != DF_MANUFACTURER_ATMEL)
- {
- /* Update SENSE key with a hardware error condition and return command fail */
- SCSI_SET_SENSE(SCSI_SENSE_KEY_HARDWARE_ERROR,
- SCSI_ASENSE_NO_ADDITIONAL_INFORMATION,
- SCSI_ASENSEQ_NO_QUALIFIER);
-
- return false;
- }
- #endif
/* Succeed the command and update the bytes transferred counter */
CommandBlock.DataTransferLength = 0;
|