Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
16f4492e
Commit
16f4492e
authored
Jun 17, 2018
by
Dean Camera
Browse files
Move class-specific functional descriptor definitions to their respective classes.
parent
45ab627b
Changes
28
Hide whitespace changes
Inline
Side-by-side
Bootloaders/CDC/Descriptors.c
View file @
16f4492e
...
...
@@ -104,7 +104,7 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor =
.
CDC_Functional_Header
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
0x00
,
.
CDCSpecification
=
VERSION_BCD
(
1
,
1
,
0
),
...
...
@@ -112,7 +112,7 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor =
.
CDC_Functional_ACM
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
0x02
,
.
Capabilities
=
0x02
,
...
...
@@ -120,7 +120,7 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor =
.
CDC_Functional_Union
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
0x06
,
.
MasterInterfaceNumber
=
INTERFACE_ID_CDC_CCI
,
...
...
Demos/Device/ClassDriver/AudioInput/Descriptors.c
View file @
16f4492e
...
...
@@ -104,7 +104,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_ControlInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_Header
,
.
ACSpecification
=
VERSION_BCD
(
1
,
0
,
0
),
...
...
@@ -118,7 +118,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_InputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_InputTerminal_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_InputTerminal_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
.
TerminalID
=
0x01
,
...
...
@@ -134,7 +134,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_OutputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_OutputTerminal_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_OutputTerminal_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
.
TerminalID
=
0x02
,
...
...
@@ -180,7 +180,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_StreamInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AS_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AS_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_General
,
.
TerminalLink
=
0x02
,
...
...
@@ -193,7 +193,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Format_t
)
+
sizeof
(
ConfigurationDescriptor
.
Audio_AudioFormatSampleRates
),
.
Type
=
DTYPE_CSInterface
},
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_FormatType
,
.
FormatType
=
0x01
,
...
...
@@ -232,7 +232,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_StreamEndpoint_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_StreamEndpoint_Spc_t
),
.
Type
=
DTYPE_CSEndpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_StreamEndpoint_Spc_t
),
.
Type
=
AUDIO_
DTYPE_CSEndpoint
},
.
Subtype
=
AUDIO_DSUBTYPE_CSEndpoint_General
,
.
Attributes
=
(
AUDIO_EP_ACCEPTS_SMALL_PACKETS
|
AUDIO_EP_SAMPLE_FREQ_CONTROL
),
...
...
Demos/Device/ClassDriver/AudioOutput/Descriptors.c
View file @
16f4492e
...
...
@@ -104,7 +104,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_ControlInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_Header
,
.
ACSpecification
=
VERSION_BCD
(
1
,
0
,
0
),
...
...
@@ -118,7 +118,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_InputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_InputTerminal_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_InputTerminal_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
.
TerminalID
=
0x01
,
...
...
@@ -134,7 +134,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_OutputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_OutputTerminal_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_OutputTerminal_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
.
TerminalID
=
0x02
,
...
...
@@ -180,7 +180,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_StreamInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AS_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AS_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_General
,
.
TerminalLink
=
0x01
,
...
...
@@ -193,7 +193,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Format_t
)
+
sizeof
(
ConfigurationDescriptor
.
Audio_AudioFormatSampleRates
),
.
Type
=
DTYPE_CSInterface
},
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_FormatType
,
.
FormatType
=
0x01
,
...
...
@@ -232,7 +232,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_StreamEndpoint_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_StreamEndpoint_Spc_t
),
.
Type
=
DTYPE_CSEndpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_StreamEndpoint_Spc_t
),
.
Type
=
AUDIO_
DTYPE_CSEndpoint
},
.
Subtype
=
AUDIO_DSUBTYPE_CSEndpoint_General
,
.
Attributes
=
(
AUDIO_EP_ACCEPTS_SMALL_PACKETS
|
AUDIO_EP_SAMPLE_FREQ_CONTROL
),
...
...
Demos/Device/ClassDriver/DualMIDI/Descriptors.c
View file @
16f4492e
...
...
@@ -104,7 +104,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_ControlInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_Header
,
.
ACSpecification
=
VERSION_BCD
(
1
,
0
,
0
),
...
...
@@ -132,7 +132,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_StreamInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_AudioInterface_AS_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_AudioInterface_AS_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_General
,
.
AudioSpecification
=
VERSION_BCD
(
1
,
0
,
0
),
...
...
@@ -143,7 +143,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_In_Jack_Emb
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
.
JackType
=
MIDI_JACKTYPE_Embedded
,
...
...
@@ -154,7 +154,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_In_Jack_Emb2
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
.
JackType
=
MIDI_JACKTYPE_Embedded
,
...
...
@@ -165,7 +165,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_In_Jack_Ext
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
.
JackType
=
MIDI_JACKTYPE_External
,
...
...
@@ -176,7 +176,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_In_Jack_Ext2
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
.
JackType
=
MIDI_JACKTYPE_External
,
...
...
@@ -187,7 +187,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_Out_Jack_Emb
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
.
JackType
=
MIDI_JACKTYPE_Embedded
,
...
...
@@ -202,7 +202,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_Out_Jack_Emb2
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
.
JackType
=
MIDI_JACKTYPE_Embedded
,
...
...
@@ -217,7 +217,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_Out_Jack_Ext
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
.
JackType
=
MIDI_JACKTYPE_External
,
...
...
@@ -232,7 +232,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_Out_Jack_Ext2
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
.
JackType
=
MIDI_JACKTYPE_External
,
...
...
@@ -263,7 +263,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_In_Jack_Endpoint_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_DualJack_Endpoint_t
),
.
Type
=
DTYPE_CSEndpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_DualJack_Endpoint_t
),
.
Type
=
AUDIO_
DTYPE_CSEndpoint
},
.
Subtype
=
AUDIO_DSUBTYPE_CSEndpoint_General
,
.
TotalEmbeddedJacks
=
0x02
,
...
...
@@ -288,7 +288,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_Out_Jack_Endpoint_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_DualJack_Endpoint_t
),
.
Type
=
DTYPE_CSEndpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_DualJack_Endpoint_t
),
.
Type
=
AUDIO_
DTYPE_CSEndpoint
},
.
Subtype
=
AUDIO_DSUBTYPE_CSEndpoint_General
,
.
TotalEmbeddedJacks
=
0x02
,
...
...
Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
View file @
16f4492e
...
...
@@ -119,7 +119,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC1_Functional_Header
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Header
,
.
CDCSpecification
=
VERSION_BCD
(
1
,
1
,
0
),
...
...
@@ -127,7 +127,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC1_Functional_ACM
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_ACM
,
.
Capabilities
=
0x06
,
...
...
@@ -135,7 +135,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC1_Functional_Union
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Union
,
.
MasterInterfaceNumber
=
INTERFACE_ID_CDC1_CCI
,
...
...
@@ -220,7 +220,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC2_Functional_Header
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Header
,
.
CDCSpecification
=
VERSION_BCD
(
1
,
1
,
0
),
...
...
@@ -228,7 +228,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC2_Functional_ACM
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_ACM
,
.
Capabilities
=
0x06
,
...
...
@@ -236,7 +236,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC2_Functional_Union
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Union
,
.
MasterInterfaceNumber
=
INTERFACE_ID_CDC2_CCI
,
...
...
Demos/Device/ClassDriver/MIDI/Descriptors.c
View file @
16f4492e
...
...
@@ -104,7 +104,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_ControlInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_Header
,
.
ACSpecification
=
VERSION_BCD
(
1
,
0
,
0
),
...
...
@@ -132,7 +132,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_StreamInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_AudioInterface_AS_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_AudioInterface_AS_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_General
,
.
AudioSpecification
=
VERSION_BCD
(
1
,
0
,
0
),
...
...
@@ -143,7 +143,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_In_Jack_Emb
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
.
JackType
=
MIDI_JACKTYPE_Embedded
,
...
...
@@ -154,7 +154,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_In_Jack_Ext
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_InputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
.
JackType
=
MIDI_JACKTYPE_External
,
...
...
@@ -165,7 +165,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_Out_Jack_Emb
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
.
JackType
=
MIDI_JACKTYPE_Embedded
,
...
...
@@ -180,7 +180,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_Out_Jack_Ext
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_OutputJack_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
.
JackType
=
MIDI_JACKTYPE_External
,
...
...
@@ -211,7 +211,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_In_Jack_Endpoint_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_Jack_Endpoint_t
),
.
Type
=
DTYPE_CSEndpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_Jack_Endpoint_t
),
.
Type
=
AUDIO_
DTYPE_CSEndpoint
},
.
Subtype
=
AUDIO_DSUBTYPE_CSEndpoint_General
,
.
TotalEmbeddedJacks
=
0x01
,
...
...
@@ -236,7 +236,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MIDI_Out_Jack_Endpoint_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_Jack_Endpoint_t
),
.
Type
=
DTYPE_CSEndpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_MIDI_Descriptor_Jack_Endpoint_t
),
.
Type
=
AUDIO_
DTYPE_CSEndpoint
},
.
Subtype
=
AUDIO_DSUBTYPE_CSEndpoint_General
,
.
TotalEmbeddedJacks
=
0x01
,
...
...
Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c
View file @
16f4492e
...
...
@@ -104,7 +104,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_Header
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Header
,
.
CDCSpecification
=
VERSION_BCD
(
1
,
1
,
0
),
...
...
@@ -112,7 +112,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_ACM
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_ACM
,
.
Capabilities
=
0x00
,
...
...
@@ -120,7 +120,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_Union
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Union
,
.
MasterInterfaceNumber
=
INTERFACE_ID_CDC_CCI
,
...
...
Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
View file @
16f4492e
...
...
@@ -105,7 +105,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_Header
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Header
,
.
CDCSpecification
=
VERSION_BCD
(
1
,
1
,
0
),
...
...
@@ -113,7 +113,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_ACM
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_ACM
,
.
Capabilities
=
0x06
,
...
...
@@ -121,7 +121,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_Union
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Union
,
.
MasterInterfaceNumber
=
INTERFACE_ID_CDC_CCI
,
...
...
Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.c
View file @
16f4492e
...
...
@@ -119,7 +119,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_Header
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Header
,
.
CDCSpecification
=
VERSION_BCD
(
1
,
1
,
0
),
...
...
@@ -127,7 +127,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_ACM
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_ACM
,
.
Capabilities
=
0x06
,
...
...
@@ -135,7 +135,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_Union
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Union
,
.
MasterInterfaceNumber
=
INTERFACE_ID_CDC_CCI
,
...
...
Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
View file @
16f4492e
...
...
@@ -138,7 +138,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_Header
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Header
,
.
CDCSpecification
=
VERSION_BCD
(
1
,
1
,
0
),
...
...
@@ -146,7 +146,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_ACM
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_ACM
,
.
Capabilities
=
0x06
,
...
...
@@ -154,7 +154,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC_Functional_Union
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Union
,
.
MasterInterfaceNumber
=
INTERFACE_ID_CDC_CCI
,
...
...
Demos/Device/LowLevel/AudioInput/Descriptors.c
View file @
16f4492e
...
...
@@ -104,7 +104,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_ControlInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_Header
,
.
ACSpecification
=
VERSION_BCD
(
1
,
0
,
0
),
...
...
@@ -118,7 +118,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_InputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_InputTerminal_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_InputTerminal_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
.
TerminalID
=
0x01
,
...
...
@@ -134,7 +134,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_OutputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_OutputTerminal_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_OutputTerminal_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
.
TerminalID
=
0x02
,
...
...
@@ -180,7 +180,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_StreamInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AS_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AS_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_General
,
.
TerminalLink
=
0x02
,
...
...
@@ -193,7 +193,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Format_t
)
+
sizeof
(
ConfigurationDescriptor
.
Audio_AudioFormatSampleRates
),
.
Type
=
DTYPE_CSInterface
},
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_FormatType
,
.
FormatType
=
0x01
,
...
...
@@ -232,7 +232,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_StreamEndpoint_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_StreamEndpoint_Spc_t
),
.
Type
=
DTYPE_CSEndpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_StreamEndpoint_Spc_t
),
.
Type
=
AUDIO_
DTYPE_CSEndpoint
},
.
Subtype
=
AUDIO_DSUBTYPE_CSEndpoint_General
,
.
Attributes
=
(
AUDIO_EP_ACCEPTS_SMALL_PACKETS
|
AUDIO_EP_SAMPLE_FREQ_CONTROL
),
...
...
Demos/Device/LowLevel/AudioOutput/Descriptors.c
View file @
16f4492e
...
...
@@ -104,7 +104,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_ControlInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AC_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_Header
,
.
ACSpecification
=
VERSION_BCD
(
1
,
0
,
0
),
...
...
@@ -118,7 +118,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_InputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_InputTerminal_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_InputTerminal_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
.
TerminalID
=
0x01
,
...
...
@@ -134,7 +134,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_OutputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_OutputTerminal_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_OutputTerminal_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
.
TerminalID
=
0x02
,
...
...
@@ -180,7 +180,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_StreamInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AS_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Interface_AS_t
),
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_General
,
.
TerminalLink
=
0x01
,
...
...
@@ -193,7 +193,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_Format_t
)
+
sizeof
(
ConfigurationDescriptor
.
Audio_AudioFormatSampleRates
),
.
Type
=
DTYPE_CSInterface
},
.
Type
=
AUDIO_
DTYPE_CSInterface
},
.
Subtype
=
AUDIO_DSUBTYPE_CSInterface_FormatType
,
.
FormatType
=
0x01
,
...
...
@@ -232,7 +232,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
Audio_StreamEndpoint_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_StreamEndpoint_Spc_t
),
.
Type
=
DTYPE_CSEndpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio_Descriptor_StreamEndpoint_Spc_t
),
.
Type
=
AUDIO_
DTYPE_CSEndpoint
},
.
Subtype
=
AUDIO_DSUBTYPE_CSEndpoint_General
,
.
Attributes
=
(
AUDIO_EP_ACCEPTS_SMALL_PACKETS
|
AUDIO_EP_SAMPLE_FREQ_CONTROL
),
...
...
Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
View file @
16f4492e
...
...
@@ -119,7 +119,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC1_Functional_Header
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalHeader_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Header
,
.
CDCSpecification
=
VERSION_BCD
(
1
,
1
,
0
),
...
...
@@ -127,7 +127,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC1_Functional_ACM
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalACM_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_ACM
,
.
Capabilities
=
0x06
,
...
...
@@ -135,7 +135,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
CDC1_Functional_Union
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
DTYPE_CSInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_CDC_Descriptor_FunctionalUnion_t
),
.
Type
=
CDC_
DTYPE_CSInterface
},
.
Subtype
=
CDC_DSUBTYPE_CSInterface_Union
,
.
MasterInterfaceNumber
=
INTERFACE_ID_CDC1_CCI
,
...
...
@@ -220,7 +220,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =