Add descriptor class, subclass and protocol constants to the class drivers, modify all demos to use them where possible.

Move out private/internal host class driver constants to the common class driver headers, so that they can be used in the Low Level host mode demos.

Ensure all demos, projects and bootloaders use the class driver constants where possible to minimise code repetition.

7 files changed, 155 insertions, 38 deletions

diff --git a/LUFA/Drivers/USB/Class/Common/Audio.h b/LUFA/Drivers/USB/Class/Common/Audio.h
index b848015e0..b5739c1d0 100644
--- a/LUFA/Drivers/USB/Class/Common/Audio.h
+++ b/LUFA/Drivers/USB/Class/Common/Audio.h
@@ -210,6 +210,31 @@
 		#define AUDIO_EP_ACCEPTS_SMALL_PACKETS    (0 << 7)
 
 	/* Enums: */
+		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Audio
+		 *  device class.
+		 */
+		enum Audio_Descriptor_ClassSubclassProtocol_t
+		{
+			AUDIO_CSCP_AudioClass                     = 0x01, /**< Descriptor Class value indicating that the device or
+			                                                   *   interface belongs to the USB Audio 1.0 class.
+			                                                   */
+			AUDIO_CSCP_ControlSubclass                = 0x01, /**< Descriptor Subclass value indicating that the device or
+			                                                   *   interface belongs to the Audio Control subclass.
+			                                                   */
+			AUDIO_CSCP_ControlProtocol                = 0x00, /**< Descriptor Protocol value indicating that the device or
+			                                                   *   interface belongs to the Audio Control protocol.
+			                                                   */
+			AUDIO_CSCP_AudioStreamingSubclass         = 0x02, /**< Descriptor Subclass value indicating that the device or
+			                                                   *   interface belongs to the MIDI Streaming subclass.
+			                                                   */
+			AUDIO_CSCP_MIDIStreamingSubclass          = 0x03, /**< Descriptor Subclass value indicating that the device or
+			                                                   *   interface belongs to the Audio streaming subclass.
+			                                                   */
+			AUDIO_CSCP_StreamingProtocol              = 0x00, /**< Descriptor Protocol value indicating that the device or
+			                                                   *   interface belongs to the Streaming Audio protocol.
+			                                                   */
+		};
+	
 		/** Audio class specific interface description subtypes, for the Audio Control interface. */
 		enum Audio_CSInterface_AC_SubTypes_t
 		{
diff --git a/LUFA/Drivers/USB/Class/Common/CDC.h b/LUFA/Drivers/USB/Class/Common/CDC.h
index eb6577e5c..b4ce72ef8 100644
--- a/LUFA/Drivers/USB/Class/Common/CDC.h
+++ b/LUFA/Drivers/USB/Class/Common/CDC.h
@@ -127,6 +127,40 @@
 		     }
 
 	/* Enums: */
+		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the CDC
+		 *  device class.
+		 */
+		enum CDC_Descriptor_ClassSubclassProtocol_t
+		{
+			CDC_CSCP_CDCClass               = 0x02, /**< Descriptor Class value indicating that the device or interface
+			                                         *   belongs to the CDC class.
+			                                         */
+			CDC_CSCP_NoSpecificSubclass     = 0x00, /**< Descriptor Subclass value indicating that the device or interface
+			                                         *   belongs to no specific subclass of the CDC class.
+			                                         */
+			CDC_CSCP_ACMSubclass            = 0x02, /**< Descriptor Subclass value indicating that the device or interface
+			                                         *   belongs to the Abstract Control Model CDC subclass.
+			                                         */
+			CDC_CSCP_ATCommandProtocol      = 0x01, /**< Descriptor Protocol value indicating that the device or interface
+			                                         *   belongs to the AT Command protocol of the CDC class.
+			                                         */
+			CDC_CSCP_NoSpecificProtocol     = 0x00, /**< Descriptor Class value indicating that the device or interface
+			                                         *   belongs to no specific protocol of the CDC class.
+			                                         */
+			CDC_CSCP_VendorSpecificProtocol = 0xFF, /**< Descriptor Class value indicating that the device or interface
+			                                         *   belongs to a vendor-specific protocol of the CDC class.
+			                                         */
+			CDC_CSCP_CDCDataClass           = 0x0A, /**< Descriptor Class value indicating that the device or interface
+			                                         *   belongs to the CDC Data class.
+			                                         */
+			CDC_CSCP_NoDataSubclass         = 0x00, /**< Descriptor Subclass value indicating that the device or interface
+			                                         *   belongs to no specific subclass of the CDC data class.
+			                                         */
+			CDC_CSCP_NoDataProtocol         = 0x00, /**< Descriptor Protocol value indicating that the device or interface
+			                                         *   belongs to no specific protocol of the CDC data class.
+			                                         */
+		};
+		
 		/** Enum for the CDC class specific control requests that can be issued by the USB bus host. */
 		enum CDC_ClassRequests_t
 		{
diff --git a/LUFA/Drivers/USB/Class/Common/HID.h b/LUFA/Drivers/USB/Class/Common/HID.h
index b5d095e08..0a7ada3a9 100644
--- a/LUFA/Drivers/USB/Class/Common/HID.h
+++ b/LUFA/Drivers/USB/Class/Common/HID.h
@@ -98,6 +98,31 @@
 		#define HID_KEYBOARD_LED_KATANA         (1 << 3)
 
 	/* Type Defines: */
+		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the HID
+		 *  device class.
+		 */
+		enum HID_Descriptor_ClassSubclassProtocol_t
+		{
+			HID_CSCP_HIDClass             = 0x03, /**< Descriptor Class value indicating that the device or interface
+			                                       *   belongs to the HID class.
+			                                       */
+			HID_CSCP_NonBootSubclass      = 0x00, /**< Descriptor Subclass value indicating that the device or interface
+			                                       *   does not implement a HID boot protocol.
+			                                       */
+			HID_CSCP_BootSubclass         = 0x01, /**< Descriptor Subclass value indicating that the device or interface
+			                                       * implements a HID boot protocol.
+			                                       */
+			HID_CSCP_NonBootProtocol      = 0x00, /**< Descriptor Protocol value indicating that the device or interface
+			                                       *   does not belong to a HID boot protocol.
+			                                       */
+			HID_CSCP_KeyboardBootProtocol = 0x01, /**< Descriptor Protocol value indicating that the device or interface
+			                                       *   belongs to the Keyboard HID boot protocol.
+			                                       */
+			HID_CSCP_MouseBootProtocol    = 0x02, /**< Descriptor Protocol value indicating that the device or interface
+			                                       *   belongs to the Mouse HID boot protocol.
+			                                       */
+		};
+	
 		/** Enum for the HID class specific control requests that can be issued by the USB bus host. */
 		enum HID_ClassRequests_t
 		{
@@ -116,23 +141,6 @@
 			HID_DTYPE_Report = 0x22, /**< Descriptor header type value, to indicate a HID class HID report descriptor. */
 		};
 
-		/** Enum for the HID class boot protocols that may be supported by HID devices. */
-		enum HID_BootProtocols_t
-		{
-			HID_BOOTP_NonBootProtocol      = 0x00, /**< Constant for the protocol value of a HID interface descriptor, indicating
-			                                        *   that the interface does not support any HID class boot protocol (see HID
-			                                        *   Class Specification).
-			                                        */
-			HID_BOOTP_KeyboardBootProtocol = 0x01, /**< Constant for the protocol value of a HID interface descriptor, indicating
-			                                        *   that the interface supports the HID class Keyboard boot protocol (see HID
-			                                        *   Class Specification).
-			                                        */
-			HID_BOOTP_MouseBootProtocol    = 0x02, /**< Constant for the protocol value of a HID interface descriptor, indicating
-			                                        *   that the interface supports the HID class Mouse boot protocol (see HID Class
-			                                        *   Specification).
-			                                        */
-		};
-
 		/** Enum for the different types of HID reports. */
 		enum HID_ReportItemTypes_t
 		{
diff --git a/LUFA/Drivers/USB/Class/Common/MIDI.h b/LUFA/Drivers/USB/Class/Common/MIDI.h
index 22e32479f..b92c5f962 100644
--- a/LUFA/Drivers/USB/Class/Common/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Common/MIDI.h
@@ -87,6 +87,7 @@
 		#define MIDI_CHANNEL(channel)        ((channel) - 1)
 
 	/* Enums: */
+		/** Enum for the possible MIDI jack types in a MIDI device jack descriptor. */
 		enum MIDI_JackTypes_t
 		{
 			MIDI_JACKTYPE_Embedded = 0x01, /**< MIDI class descriptor jack type value for an embedded (logical) MIDI input or output jack. */
diff --git a/LUFA/Drivers/USB/Class/Common/MassStorage.h b/LUFA/Drivers/USB/Class/Common/MassStorage.h
index e8693335d..01e5c9445 100644
--- a/LUFA/Drivers/USB/Class/Common/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Common/MassStorage.h
@@ -205,25 +205,42 @@
 		#define SCSI_ASENSEQ_OPERATION_IN_PROGRESS             0x07
 
 	/* Enums: */
+		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Mass
+		 *  Storage device class.
+		 */
+		enum MS_Descriptor_ClassSubclassProtocol_t
+		{
+			MS_CSCP_MassStorageClass          = 0x08, /**< Descriptor Class value indicating that the device or interface
+			                                           *   belongs to the Mass Storage class.
+			                                           */
+			MS_CSCP_SCSITransparentSubclass   = 0x06, /**< Descriptor Subclass value indicating that the device or interface
+			                                           *   belongs to the SCSI Transparent Command Set subclass of the Mass
+			                                           *   storage class.
+			                                           */
+			MS_CSCP_BulkOnlyTransportProtocol = 0x50, /**< Descriptor Protocol value indicating that the device or interface
+			                                           *   belongs to the Bulk Only Transport protocol of the Mass Storage class.
+			                                           */
+		};
+	
 		/** Enum for the Mass Storage class specific control requests that can be issued by the USB bus host. */
 		enum MS_ClassRequests_t
 		{
-			MS_REQ_GetMaxLUN        = 0xFE, /**< Mass Storage class-specific request to retrieve the total number of Logical
-			                                 *   Units (drives) in the SCSI device.
-			                                 */
-			MS_REQ_MassStorageReset = 0xFF, /**< Mass Storage class-specific request to reset the Mass Storage interface,
-			                                 *   ready for the next command.
-		                                     */
+			MS_REQ_GetMaxLUN                  = 0xFE, /**< Mass Storage class-specific request to retrieve the total number of Logical
+			                                           *   Units (drives) in the SCSI device.
+			                                           */
+			MS_REQ_MassStorageReset           = 0xFF, /**< Mass Storage class-specific request to reset the Mass Storage interface,
+			                                           *   ready for the next command.
+		                                               */
 		};
 
 		/** Enum for the possible command status wrapper return status codes. */
 		enum MS_CommandStatusCodes_t
 		{
-			MS_SCSI_COMMAND_Pass        = 0, /**< Command completed with no error */
-			MS_SCSI_COMMAND_Fail        = 1, /**< Command failed to complete - host may check the exact error via a
-			                                  *   SCSI REQUEST SENSE command.
-			                                  */
-			MS_SCSI_COMMAND_PhaseError  = 2, /**< Command failed due to being invalid in the current phase. */
+			MS_SCSI_COMMAND_Pass              = 0, /**< Command completed with no error */
+			MS_SCSI_COMMAND_Fail              = 1, /**< Command failed to complete - host may check the exact error via a
+			                                        *   SCSI REQUEST SENSE command.
+			                                        */
+			MS_SCSI_COMMAND_PhaseError        = 2, /**< Command failed due to being invalid in the current phase. */
 		};
 
 	/* Type Defines: */
diff --git a/LUFA/Drivers/USB/Class/Common/Printer.h b/LUFA/Drivers/USB/Class/Common/Printer.h
index 03ae12e59..6619ced04 100644
--- a/LUFA/Drivers/USB/Class/Common/Printer.h
+++ b/LUFA/Drivers/USB/Class/Common/Printer.h
@@ -76,19 +76,35 @@
 		#define PRNT_PORTSTATUS_PAPEREMPTY  (1 << 5)
 
 	/* Enums: */
+		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Printer
+		 *  device class.
+		 */
+		enum PRNT_Descriptor_ClassSubclassProtocol_t
+		{
+			PRNT_CSCP_PrinterClass          = 0x07, /**< Descriptor Class value indicating that the device or interface
+			                                         *   belongs to the Printer class.
+			                                         */
+			PRNT_CSCP_PrinterSubclass       = 0x01, /**< Descriptor Subclass value indicating that the device or interface
+			                                         *   belongs to the Printer subclass.
+			                                         */
+			PRNT_CSCP_BidirectionalProtocol = 0x02, /**< Descriptor Protocol value indicating that the device or interface
+			                                         *   belongs to the Bidirectional protocol of the Printer class.
+			                                         */
+		};
+	
 		/** Enum for the Printer class specific control requests that can be issued by the USB bus host. */
 		enum PRNT_ClassRequests_t
 		{
-			PRNT_REQ_GetDeviceID      = 0x00, /**< Printer class-specific request to retrieve the Unicode ID
-			                                   *   string of the device, containing the device's name, manufacturer
-			                                   *   and supported printer languages.
-			                                   */
-			PRNT_REQ_GetPortStatus    = 0x01, /**< Printer class-specific request to get the current status of the
-			                                   *   virtual printer port, for device selection and ready states.
-			                                   */
-			PRNT_REQ_SoftReset        = 0x02, /**< Printer class-specific request to reset the device, ready for new
-			                                   *   printer commands.
-			                                   */
+			PRNT_REQ_GetDeviceID            = 0x00, /**< Printer class-specific request to retrieve the Unicode ID
+			                                         *   string of the device, containing the device's name, manufacturer
+			                                         *   and supported printer languages.
+			                                         */
+			PRNT_REQ_GetPortStatus          = 0x01, /**< Printer class-specific request to get the current status of the
+			                                         *   virtual printer port, for device selection and ready states.
+			                                         */
+			PRNT_REQ_SoftReset              = 0x02, /**< Printer class-specific request to reset the device, ready for new
+			                                         *   printer commands.
+			                                         */
 		};		
 
 	/* Disable C linkage for C++ Compilers: */
diff --git a/LUFA/Drivers/USB/Class/Common/StillImage.h b/LUFA/Drivers/USB/Class/Common/StillImage.h
index bb9460934..98dc7981c 100644
--- a/LUFA/Drivers/USB/Class/Common/StillImage.h
+++ b/LUFA/Drivers/USB/Class/Common/StillImage.h
@@ -100,6 +100,22 @@
 		};
 
 	/* Enums: */
+		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the
+		 *  Still Image device class.
+		 */
+		enum SI_Descriptor_ClassSubclassProtocol_t
+		{
+			SI_CSCP_StillImageClass             = 0x06, /**< Descriptor Class value indicating that the device or interface
+			                                             *   belongs to the Still Image class.
+			                                             */
+			SI_CSCP_StillImageSubclass          = 0x01, /**< Descriptor Subclass value indicating that the device or interface
+			                                             *   belongs to the Still Image subclass.
+			                                             */
+			SI_CSCP_BulkOnlyProtocol            = 0x01, /**< Descriptor Protocol value indicating that the device or interface
+			                                             *   belongs to the Bulk Only Transport protocol of the Still Image class.
+			                                             */
+		};
+
 		/** Enums for the possible status codes of a returned Response Block from an attached PIMA compliant Still Image device. */
 		enum PIMA_ResponseCodes_t
 		{