From a504a3a010ec2441dda0209f195492fb36e7c97b Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Fri, 24 Apr 2009 07:28:51 +0000
Subject: Endpoint configuration is now refined to give better output when all
 configurations have static inputs - removed the now useless
 STATIC_ENDPOINT_CONFIGURATION compile time token.

---
 Demos/Device/MassStorage/SCSI.c   | 2 +-
 Demos/Device/MassStorage/SCSI.h   | 6 ++++++
 Demos/Device/MassStorage/makefile | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'Demos/Device/MassStorage')

diff --git a/Demos/Device/MassStorage/SCSI.c b/Demos/Device/MassStorage/SCSI.c
index 6ddd144ca..a88be515a 100644
--- a/Demos/Device/MassStorage/SCSI.c
+++ b/Demos/Device/MassStorage/SCSI.c
@@ -43,7 +43,7 @@
  */
 SCSI_Inquiry_Response_t InquiryData = 
 	{
-		.DeviceType          = 0,
+		.DeviceType          = DEVICE_TYPE_BLOCK,
 		.PeripheralQualifier = 0,
 			
 		.Removable           = true,
diff --git a/Demos/Device/MassStorage/SCSI.h b/Demos/Device/MassStorage/SCSI.h
index 58eea1b41..158b7ed2d 100644
--- a/Demos/Device/MassStorage/SCSI.h
+++ b/Demos/Device/MassStorage/SCSI.h
@@ -67,7 +67,13 @@
 
 		/** Macro for the SCSI_Command_ReadWrite_10() function, to indicate that data is to be written to the storage medium. */
 		#define DATA_WRITE     false
+
+		/** Value for the DeviceType entry in the SCSI_Inquiry_Response_t enum, indicating a Block Media device. */
+		#define DEVICE_TYPE_BLOCK 0x00
 		
+		/** 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.
diff --git a/Demos/Device/MassStorage/makefile b/Demos/Device/MassStorage/makefile
index 9ef390db8..faee640b0 100644
--- a/Demos/Device/MassStorage/makefile
+++ b/Demos/Device/MassStorage/makefile
@@ -187,7 +187,7 @@ CSTANDARD = -std=gnu99
 # Place -D or -U options here for C sources
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
 CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DUSB_DEVICE_ONLY
-CDEFS += -DSTATIC_ENDPOINT_CONFIGURATION -DFIXED_CONTROL_ENDPOINT_SIZE=8
+CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION
 CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
 
 
-- 
cgit v1.2.3