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.

5 files changed, 124 insertions, 73 deletions

diff --git a/LUFA/Drivers/USB/Class/Common/MassStorage.h b/LUFA/Drivers/USB/Class/Common/MassStorage.h
index fe3e97734..49a18663f 100644
--- a/LUFA/Drivers/USB/Class/Common/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Common/MassStorage.h
@@ -213,6 +213,69 @@
 			uint8_t  Status; /**< Status code of the issued command - a value from the MassStorage_CommandStatusCodes_t enum */

 		} MS_CommandStatusWrapper_t;

 		

+		/** Type define for a SCSI Sense structure. Structures of this type are filled out by the

+		 *  device via the MassStore_RequestSense() function, indicating the current sense data of the

+		 *  device (giving explicit error codes for the last issued 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;

+

+		/** Type define for a SCSI Inquiry structure. Structures of this type are filled out by the

+		 *  device via the MassStore_Inquiry() function, retrieving the attached device's information.

+		 *  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;

+

 	/* Enums: */

 		/** Enum for the possible command status wrapper return status codes. */

 		enum MassStorage_CommandStatusCodes_t

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDC.c
index fcfa86d79..2d42be65f 100644
--- a/LUFA/Drivers/USB/Class/Host/CDC.c
+++ b/LUFA/Drivers/USB/Class/Host/CDC.c
@@ -340,6 +340,12 @@ void CDC_Host_CreateStream(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, FILE* Str
 	fdev_set_udata(Stream, CDCInterfaceInfo);

 }

 

+void CDC_Host_CreateBlockingStream(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, FILE* Stream)

+{

+	*Stream = (FILE)FDEV_SETUP_STREAM(CDC_Host_putchar, CDC_Host_getchar_Blocking, _FDEV_SETUP_RW);

+	fdev_set_udata(Stream, CDCInterfaceInfo);

+}

+

 static int CDC_Host_putchar(char c, FILE* Stream)

 {

 	return CDC_Host_SendByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream), c) ? _FDEV_ERR : 0;

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.h b/LUFA/Drivers/USB/Class/Host/MassStorage.h
index 17e5babe6..fc3bc6678 100644
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.h
@@ -92,69 +92,6 @@
 						  *   the interface is enumerated.

 						  */

 			} USB_ClassInfo_MS_Host_t;

-

-			/** Type define for a SCSI Sense structure. Structures of this type are filled out by the

-			 *  device via the MassStore_RequestSense() function, indicating the current sense data of the

-			 *  device (giving explicit error codes for the last issued 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;

-

-			/** Type define for a SCSI Inquiry structure. Structures of this type are filled out by the

-			 *  device via the MassStore_Inquiry() function, retrieving the attached device's information.

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

 			

 			/** SCSI capacity structure, to hold the total capacity of the device in both the number

 			 *  of blocks in the current LUN, and the size of each block. This structure is filled by

diff --git a/LUFA/Drivers/USB/HighLevel/USBMode.h b/LUFA/Drivers/USB/HighLevel/USBMode.h
index ba221c520..e47c9c1d9 100644
--- a/LUFA/Drivers/USB/HighLevel/USBMode.h
+++ b/LUFA/Drivers/USB/HighLevel/USBMode.h
@@ -28,11 +28,58 @@
   this software.

 */

 

+/** \ingroup Group_USB

+ *  @defgroup Group_USBMode USB Configuration Tokens

+ *

+ *  After the inclusion of the master USB driver header, one or more of the following

+ *  tokens may be defined, to allow the user code to conditionally enable or disable

+ *  code based on the USB controller family and allowable USB modes. These tokens may

+ *  be tested against to eliminate code relating to a USB mode which is not enabled for

+ *  the given compilation.

+ *

+ *  @{

+ */

+

 #ifndef __USBMODE_H__

 #define __USBMODE_H__

 

-	/* Private Interface - For use in library only: */

-	#if !defined(__DOXYGEN__)

+	/* Public Interface - May be used in end-application: */

+	#if defined(__DOXYGEN__)

+		/** Indicates that the target AVR microcontroller belongs to the Series 2 USB controller

+		 *  (i.e. AT90USBXXX2 or ATMEGAXXU2) when defined.

+		 */

+		#define USB_SERIES_2_AVR

+

+		/** Indicates that the target AVR microcontroller belongs to the Series 4 USB controller

+		 *  (i.e. ATMEGAXXU4) when defined.

+		 */

+		#define USB_SERIES_4_AVR

+

+		/** Indicates that the target AVR microcontroller belongs to the Series 6 USB controller

+		 *  (i.e. AT90USBXXX6) when defined.

+		 */

+		#define USB_SERIES_6_AVR

+

+		/** Indicates that the target AVR microcontroller belongs to the Series 7 USB controller

+		 *  (i.e. AT90USBXXX7) when defined.

+		 */

+		#define USB_SERIES_7_AVR

+

+		/** Indicates that the target AVR microcontroller and compilation settings allow for the

+		 *  target to be configured in USB Device mode when defined.

+		 */

+		#define USB_CAN_BE_DEVICE

+

+		/** Indicates that the target AVR microcontroller and compilation settings allow for the

+		 *  target to be configured in USB Host mode when defined.

+		 */

+		#define USB_CAN_BE_HOST

+

+		/** Indicates that the target AVR microcontroller and compilation settings allow for the

+		 *  target to be configured in either USB Device or Host mode when defined.

+		 */

+		#define USB_CAN_BE_BOTH

+	#else

 		/* Macros: */			

 			#if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__)  || \

 			     defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__))

@@ -71,3 +118,5 @@
 	#endif

 	

 #endif

+

+/** @} */
\ No newline at end of file
diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h
index e2610c528..743a318ad 100644
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.h
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h
@@ -112,14 +112,10 @@
 			 */

 			#define USB_MODE_DEVICE                    1

 			

-			#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)

-				/** Mode mask for the \ref USB_CurrentMode global and the \ref USB_Init() function. This indicates that the

-				 *  USB interface is or should be initialized in the USB host mode.

-				 *

-				 *  \note This token is not available on AVR models which do not support host mode.

-				 */

-				#define USB_MODE_HOST                  2

-			#endif

+			/** Mode mask for the \ref USB_CurrentMode global and the \ref USB_Init() function. This indicates that the

+			 *  USB interface is or should be initialized in the USB host mode.

+			 */

+			#define USB_MODE_HOST                      2

 			

 			#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)

 				/** Mode mask for the the \ref USB_Init() function. This indicates that the USB interface should be