The incomplete StandaloneProgrammer project now uses Host and Device Mass storage classes, so that program data can either be loaded onto the device's Dataflash storage, or read off an attached USB memory stick.

The USB target family and allowable USB mode tokens are now public and documented (USB_CAN_BE_*, USB_SERIES_*_AVR).

The SCSI_Request_Sense_Response_t and SCSI_Inquiry_Response_t type defines are now part of the Mass Storage Class driver common defines, rather than being defined in the Host mode Class driver section only.

The USB_MODE_HOST token is now defined even when host mode is not available.

Added missing CDC_Host_CreateBlockingStream() function code to the CDC Host Class driver.

6 files changed, 61 insertions, 98 deletions

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c
index 6646278ee..d79f5f742 100644
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c
@@ -39,6 +39,7 @@
 #define  INCLUDE_FROM_DATAFLASHMANAGER_C

 #include "DataflashManager.h"

 

+#if defined(USB_CAN_BE_DEVICE)

 /** Writes blocks (OS blocks, not Dataflash pages) to the storage medium, the board dataflash IC(s), from

  *  the pre-selected data OUT endpoint. This routine reads in OS sized blocks from the endpoint and writes

  *  them to the dataflash in Dataflash page sized blocks.

@@ -523,3 +524,4 @@ bool DataflashManager_CheckDataflashOperation(void)
 	

 	return true;

 }

+#endif

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h
index 9b74b2eaa..d5e01a113 100644
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h
@@ -42,10 +42,9 @@
 		#include "StandaloneProgrammer.h"

 		#include "Descriptors.h"

 

-		#include <LUFA/Common/Common.h>                 // Function Attribute, Atomic, Debug and ISR Macros

-		#include <LUFA/Drivers/USB/USB.h>               // USB Functionality

-		#include <LUFA/Drivers/USB/Class/MassStorage.h> // Mass Storage Class Driver

-		#include <LUFA/Drivers/Board/Dataflash.h>       // Dataflash chip driver

+		#include <LUFA/Drivers/USB/USB.h>

+		#include <LUFA/Drivers/USB/Class/MassStorage.h>

+		#include <LUFA/Drivers/Board/Dataflash.h>

 

 	/* Preprocessor Checks: */

 		#if (DATAFLASH_PAGE_SIZE % 16)

@@ -67,15 +66,17 @@
 		#define VIRTUAL_MEMORY_BLOCKS               (VIRTUAL_MEMORY_BYTES / VIRTUAL_MEMORY_BLOCK_SIZE)

 		

 	/* Function Prototypes: */

-		void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const uint32_t BlockAddress,

-		                                  uint16_t TotalBlocks);

-		void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const uint32_t BlockAddress,

-		                                 uint16_t TotalBlocks);

-		void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks,

-		                                      uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);

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

-		

+		#if defined(USB_CAN_BE_DEVICE)

+			void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const uint32_t BlockAddress,

+											  uint16_t TotalBlocks);

+			void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const uint32_t BlockAddress,

+											 uint16_t TotalBlocks);

+			void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks,

+												  uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);

+			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

+

 #endif

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
index 0084fa514..013467c25 100644
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
@@ -5,7 +5,9 @@
 #include "diskio.h"

 

 #include <string.h>

+#include <LUFA/Drivers/USB/Class/MassStorage.h>

 #include "../DataflashManager.h"

+#include "../../DiskHost.h"

 

 /*-----------------------------------------------------------------------*/

 /* Initialize Disk Drive                                                 */

@@ -33,14 +35,29 @@ DRESULT disk_readp (
 	WORD count			/* Byte count (bit15:destination) */

 )

 {

-	DRESULT res;

-

+	DRESULT ErrorCode = RES_OK;

 	uint8_t BlockTemp[512];

-	DataflashManager_ReadBlocks_RAM(sector, 1, BlockTemp);

-	memcpy(dest, &BlockTemp[sofs], count);

 

-	res = RES_OK;

+	if (USB_CurrentMode == USB_MODE_HOST)

+	{

+		#if defined(USB_CAN_BE_HOST)

+		if (USB_HostState != HOST_STATE_Configured)

+		  ErrorCode = RES_NOTRDY;

+		else if (MS_Host_ReadDeviceBlocks(&DiskHost_MS_Interface, 0, sector, 1, 512, BlockTemp))

+		  ErrorCode = RES_ERROR;

+

+		printf("BLOCK READ #%lu Ret %d\r\n", sector, MS_Host_ReadDeviceBlocks(&DiskHost_MS_Interface, 0, sector, 1, 512, BlockTemp));

+		#endif

+	}

+	else

+	{

+		#if defined(USB_CAN_BE_DEVICE)

+		DataflashManager_ReadBlocks_RAM(sector, 1, BlockTemp);

+		#endif

+	}

+

+	memcpy(dest, &BlockTemp[sofs], count);

 

-	return res;

+	return ErrorCode;

 }

 

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c b/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
index 2f3d95ba6..e8ee8e37c 100644
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
@@ -44,7 +44,7 @@ bool ProgrammerConfig_ProcessConfiguration(void)
 

 	if (!(pf_open("CONF.txt") == FR_OK))

 	{

-		fputs(" >> ERROR: CONF.txt File Not Found.\r\n", &USBSerialStream);

+		puts(" >> ERROR: CONF.txt File Not Found.\r\n");

 		return false;

 	}

 	

@@ -53,7 +53,7 @@ bool ProgrammerConfig_ProcessConfiguration(void)
 			

 	do

 	{

-		CurrentLine = fgets(LineBuff, sizeof(LineBuff), &DataflashStream);

+		CurrentLine = fgets(LineBuff, sizeof(LineBuff), &DiskStream);

 		

 		if (CurrentLine)

 		{

@@ -66,12 +66,12 @@ bool ProgrammerConfig_ProcessConfiguration(void)
 		}

 	} while (CurrentLine);

 	

-	fprintf(&USBSerialStream, " >> *** Configuration: ***\r\n");

-	fprintf(&USBSerialStream, " >> Device Signature: 0x%02x 0x%02x 0x%02x 0x%02x\r\n", ProgrammerConfig.SigBytes[0],

-			                                                                           ProgrammerConfig.SigBytes[1],

-			                                                                           ProgrammerConfig.SigBytes[2],

-			                                                                           ProgrammerConfig.SigBytes[3]);

-	fprintf(&USBSerialStream, " >> Programming Speed: %lu Hz\r\n", ProgrammerConfig.ProgrammingSpeed);

+	printf(" >> *** Configuration: ***\r\n");

+	printf(" >> Device Signature: 0x%02x 0x%02x 0x%02x 0x%02x\r\n", ProgrammerConfig.SigBytes[0],

+			                                                        ProgrammerConfig.SigBytes[1],

+			                                                        ProgrammerConfig.SigBytes[2],

+			                                                        ProgrammerConfig.SigBytes[3]);

+	printf(" >> Programming Speed: %lu Hz\r\n", ProgrammerConfig.ProgrammingSpeed);

 	

 	return true;

 }

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c
index 6a978718f..44e10d20c 100644
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c
@@ -38,6 +38,7 @@
 #define  INCLUDE_FROM_SCSI_C

 #include "SCSI.h"

 

+#if defined(USB_CAN_BE_DEVICE)

 /** Structure to hold the SCSI response data to a SCSI INQUIRY command. This gives information about the device's

  *  features and capabilities.

  */

@@ -279,3 +280,4 @@ static void 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);

 }

+#endif

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h
index 91ba77dd5..ba411b291 100644
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h
@@ -70,77 +70,18 @@
 		

 		/** Value for the DeviceType entry in the SCSI_Inquiry_Response_t enum, indicating a CD-ROM device. */

 		#define DEVICE_TYPE_CDROM   0x05

-

-	/* Type Defines: */

-		/** Type define for a SCSI response structure to a SCSI INQUIRY command. For details of the

-		 *  structure contents, refer to the SCSI specifications.

-		 */

-		typedef struct

-		{

-			unsigned char DeviceType          : 5;

-			unsigned char PeripheralQualifier : 3;

-			

-			unsigned char _RESERVED1          : 7;

-			unsigned char Removable           : 1;

-			

-			uint8_t      Version;

-			

-			unsigned char ResponseDataFormat  : 4;

-			unsigned char _RESERVED2          : 1;

-			unsigned char NormACA             : 1;

-			unsigned char TrmTsk              : 1;

-			unsigned char AERC                : 1;

-

-			uint8_t      AdditionalLength;

-			uint8_t      _RESERVED3[2];

-

-			unsigned char SoftReset           : 1;

-			unsigned char CmdQue              : 1;

-			unsigned char _RESERVED4          : 1;

-			unsigned char Linked              : 1;

-			unsigned char Sync                : 1;

-			unsigned char WideBus16Bit        : 1;

-			unsigned char WideBus32Bit        : 1;

-			unsigned char RelAddr             : 1;

-			

-			uint8_t      VendorID[8];

-			uint8_t      ProductID[16];

-			uint8_t      RevisionID[4];

-		} SCSI_Inquiry_Response_t;

-		

-		/** Type define for a SCSI sense structure to a SCSI REQUEST SENSE command. For details of the

-		 *  structure contents, refer to the SCSI specifications.

-		 */

-		typedef struct

-		{

-			uint8_t       ResponseCode;

-			

-			uint8_t       SegmentNumber;

-			

-			unsigned char SenseKey            : 4;

-			unsigned char _RESERVED1          : 1;

-			unsigned char ILI                 : 1;

-			unsigned char EOM                 : 1;

-			unsigned char FileMark            : 1;

-			

-			uint8_t      Information[4];

-			uint8_t      AdditionalLength;

-			uint8_t      CmdSpecificInformation[4];

-			uint8_t      AdditionalSenseCode;

-			uint8_t      AdditionalSenseQualifier;

-			uint8_t      FieldReplaceableUnitCode;

-			uint8_t      SenseKeySpecific[3];

-		} SCSI_Request_Sense_Response_t;

 		

 	/* Function Prototypes: */

-		bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

-		

-		#if defined(INCLUDE_FROM_SCSI_C)

-			static void SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

-			static void SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

-			static void SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

-			static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

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

+		#if defined(USB_CAN_BE_DEVICE)

+			bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

+			

+			#if defined(INCLUDE_FROM_SCSI_C)

+				static void SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

+				static void SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

+				static void SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

+				static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

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

+			#endif

 		#endif

 		

 #endif