Move Dataflash operational checking code out from SCSI.c into the DataflashManager.c in the Device mode Mass Storage demos.

3 files changed, 38 insertions, 29 deletions

diff --git a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c
index 9cd0279d6..7d070f37c 100644
--- a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c
+++ b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c
@@ -488,3 +488,36 @@ void DataflashManager_ResetDataflashProtections(void)
 	/* Deselect current dataflash chip */

 	Dataflash_DeselectChip();

 }

+

+/** Performs a simple test on the attached Dataflash IC(s) to ensure that they are working.

+ *

+ *  \return Boolean true if all media chips are working, false otherwise

+ */

+bool DataflashManager_CheckDataflashOperation(void)

+{

+	uint8_t ReturnByte;

+

+	/* 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)

+	  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)

+	  return false;

+	#endif

+	

+	return true;

+}

diff --git a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h
index 1332fd3a3..b7b5a1e78 100644
--- a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h
+++ b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h
@@ -71,5 +71,6 @@
 		void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks,

 		                                     uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);

 		void DataflashManager_ResetDataflashProtections(void);

+		bool DataflashManager_CheckDataflashOperation(void);

 		

 #endif

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;