From 04660d3793292fad5a09bd50ae9615e53ca4aa10 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Fri, 1 Jul 2011 05:26:25 +0000 Subject: Seperate out the device demos and project's configuration descriptor structure definitions to clearly indicate what descriptors belong to which interface. --- Projects/AVRISP-MKII/Descriptors.h | 2 ++ Projects/Benito/Descriptors.h | 4 ++++ Projects/Incomplete/StandaloneProgrammer/Descriptors.h | 2 ++ Projects/LEDNotifier/Descriptors.h | 4 ++++ Projects/MIDIToneGenerator/Descriptors.h | 4 ++++ Projects/Magstripe/Descriptors.h | 2 ++ Projects/MediaController/Descriptors.h | 2 ++ Projects/RelayBoard/Descriptors.h | 2 ++ Projects/TempDataLogger/Descriptors.h | 4 ++++ Projects/USBtoSerial/Descriptors.h | 4 ++++ Projects/Webserver/Descriptors.h | 6 ++++++ Projects/XPLAINBridge/AVRISPDescriptors.h | 2 ++ Projects/XPLAINBridge/USARTDescriptors.h | 4 ++++ 13 files changed, 42 insertions(+) (limited to 'Projects') diff --git a/Projects/AVRISP-MKII/Descriptors.h b/Projects/AVRISP-MKII/Descriptors.h index ca68fd518..786e487bd 100644 --- a/Projects/AVRISP-MKII/Descriptors.h +++ b/Projects/AVRISP-MKII/Descriptors.h @@ -67,6 +67,8 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // Atmel AVRISP-MKII Interface USB_Descriptor_Interface_t AVRISP_Interface; USB_Descriptor_Endpoint_t AVRISP_DataInEndpoint; USB_Descriptor_Endpoint_t AVRISP_DataOutEndpoint; diff --git a/Projects/Benito/Descriptors.h b/Projects/Benito/Descriptors.h index 6e2dd7804..fba6e031c 100644 --- a/Projects/Benito/Descriptors.h +++ b/Projects/Benito/Descriptors.h @@ -65,11 +65,15 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // CDC Command Interface USB_Descriptor_Interface_t CDC_CCI_Interface; USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header; USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM; USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_NotificationEndpoint; + + // CDC Data Interface USB_Descriptor_Interface_t CDC_DCI_Interface; USB_Descriptor_Endpoint_t CDC_DataOutEndpoint; USB_Descriptor_Endpoint_t CDC_DataInEndpoint; diff --git a/Projects/Incomplete/StandaloneProgrammer/Descriptors.h b/Projects/Incomplete/StandaloneProgrammer/Descriptors.h index dac92cd2d..0ebc36754 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Descriptors.h +++ b/Projects/Incomplete/StandaloneProgrammer/Descriptors.h @@ -74,6 +74,8 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // Mass Storage Interface USB_Descriptor_Interface_t MS_Interface; USB_Descriptor_Endpoint_t MS_DataInEndpoint; USB_Descriptor_Endpoint_t MS_DataOutEndpoint; diff --git a/Projects/LEDNotifier/Descriptors.h b/Projects/LEDNotifier/Descriptors.h index 6e2dd7804..5ce8f34fa 100644 --- a/Projects/LEDNotifier/Descriptors.h +++ b/Projects/LEDNotifier/Descriptors.h @@ -65,11 +65,15 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // CDC Command Interface USB_Descriptor_Interface_t CDC_CCI_Interface; USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header; USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM; USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_NotificationEndpoint; + + // CDC Data Interface USB_Descriptor_Interface_t CDC_DCI_Interface; USB_Descriptor_Endpoint_t CDC_DataOutEndpoint; USB_Descriptor_Endpoint_t CDC_DataInEndpoint; diff --git a/Projects/MIDIToneGenerator/Descriptors.h b/Projects/MIDIToneGenerator/Descriptors.h index 2b5e7c59c..4f0eccab7 100644 --- a/Projects/MIDIToneGenerator/Descriptors.h +++ b/Projects/MIDIToneGenerator/Descriptors.h @@ -59,8 +59,12 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // MIDI Audio Control Interface USB_Descriptor_Interface_t Audio_ControlInterface; USB_Audio_Descriptor_Interface_AC_t Audio_ControlInterface_SPC; + + // MIDI Audio Streaming Interface USB_Descriptor_Interface_t Audio_StreamInterface; USB_MIDI_Descriptor_AudioInterface_AS_t Audio_StreamInterface_SPC; USB_MIDI_Descriptor_InputJack_t MIDI_In_Jack_Emb; diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h index 17e6aab77..9a71ada96 100644 --- a/Projects/Magstripe/Descriptors.h +++ b/Projects/Magstripe/Descriptors.h @@ -50,6 +50,8 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; /**< Configuration descriptor header structure */ + + // Keyboard HID Interface USB_Descriptor_Interface_t HID_Interface; /**< Keyboard interface descriptor */ USB_HID_Descriptor_HID_t HID_KeyboardHID; /**< Keyboard HID descriptor */ USB_Descriptor_Endpoint_t HID_ReportINEndpoint; /**< Keyboard key report endpoint descriptor */ diff --git a/Projects/MediaController/Descriptors.h b/Projects/MediaController/Descriptors.h index d3d393c9f..74331c27f 100644 --- a/Projects/MediaController/Descriptors.h +++ b/Projects/MediaController/Descriptors.h @@ -49,6 +49,8 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // Media Controller HID Interface USB_Descriptor_Interface_t HID_Interface; USB_HID_Descriptor_HID_t HID_MediaControlHID; USB_Descriptor_Endpoint_t HID_ReportINEndpoint; diff --git a/Projects/RelayBoard/Descriptors.h b/Projects/RelayBoard/Descriptors.h index d913eb722..ac8a8e0aa 100644 --- a/Projects/RelayBoard/Descriptors.h +++ b/Projects/RelayBoard/Descriptors.h @@ -49,6 +49,8 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // Relay Board Interface USB_Descriptor_Interface_t RelayBoardInterface; } USB_Descriptor_Configuration_t; diff --git a/Projects/TempDataLogger/Descriptors.h b/Projects/TempDataLogger/Descriptors.h index 283e44737..0ba6204ec 100644 --- a/Projects/TempDataLogger/Descriptors.h +++ b/Projects/TempDataLogger/Descriptors.h @@ -43,9 +43,13 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // Mass Storage Interface USB_Descriptor_Interface_t MS_Interface; USB_Descriptor_Endpoint_t MS_DataInEndpoint; USB_Descriptor_Endpoint_t MS_DataOutEndpoint; + + // Settings Management Generic HID Interface USB_Descriptor_Interface_t HID_Interface; USB_HID_Descriptor_HID_t HID_GenericHID; USB_Descriptor_Endpoint_t HID_ReportINEndpoint; diff --git a/Projects/USBtoSerial/Descriptors.h b/Projects/USBtoSerial/Descriptors.h index 6e2dd7804..5ce8f34fa 100644 --- a/Projects/USBtoSerial/Descriptors.h +++ b/Projects/USBtoSerial/Descriptors.h @@ -65,11 +65,15 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // CDC Command Interface USB_Descriptor_Interface_t CDC_CCI_Interface; USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header; USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM; USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_NotificationEndpoint; + + // CDC Data Interface USB_Descriptor_Interface_t CDC_DCI_Interface; USB_Descriptor_Endpoint_t CDC_DataOutEndpoint; USB_Descriptor_Endpoint_t CDC_DataInEndpoint; diff --git a/Projects/Webserver/Descriptors.h b/Projects/Webserver/Descriptors.h index e285dfba5..da8456e93 100644 --- a/Projects/Webserver/Descriptors.h +++ b/Projects/Webserver/Descriptors.h @@ -74,15 +74,21 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // RNDIS CDC Command Interface USB_Descriptor_Interface_Association_t CDC_IAD; USB_Descriptor_Interface_t CDC_CCI_Interface; USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header; USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM; USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_NotificationEndpoint; + + // RNDIS CDC Data Interface USB_Descriptor_Interface_t CDC_DCI_Interface; USB_Descriptor_Endpoint_t RNDIS_DataOutEndpoint; USB_Descriptor_Endpoint_t RNDIS_DataInEndpoint; + + // Mass Storage Interface USB_Descriptor_Interface_t MS_Interface; USB_Descriptor_Endpoint_t MS_DataInEndpoint; USB_Descriptor_Endpoint_t MS_DataOutEndpoint; diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.h b/Projects/XPLAINBridge/AVRISPDescriptors.h index 2b6f3f41d..e98ea24dc 100644 --- a/Projects/XPLAINBridge/AVRISPDescriptors.h +++ b/Projects/XPLAINBridge/AVRISPDescriptors.h @@ -67,6 +67,8 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // Atmel AVRISP-MKII Interface USB_Descriptor_Interface_t AVRISP_Interface; USB_Descriptor_Endpoint_t AVRISP_DataInEndpoint; USB_Descriptor_Endpoint_t AVRISP_DataOutEndpoint; diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h index 7356e1f3e..f504011eb 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.h +++ b/Projects/XPLAINBridge/USARTDescriptors.h @@ -65,11 +65,15 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; + + // CDC Control Interface USB_Descriptor_Interface_t CDC_CCI_Interface; USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header; USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM; USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_NotificationEndpoint; + + // CDC Data Interface USB_Descriptor_Interface_t CDC_DCI_Interface; USB_Descriptor_Endpoint_t CDC_DataOutEndpoint; USB_Descriptor_Endpoint_t CDC_DataInEndpoint; -- cgit v1.2.3