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
3cbdcd36
Commit
3cbdcd36
authored
Jun 26, 2009
by
Dean Camera
Browse files
Reduce struct name pollution - group typedef struct names by class driver name where appropriate.
parent
7366f590
Changes
40
Hide whitespace changes
Inline
Side-by-side
Demos/Device/ClassDriver/AudioInput/Descriptors.c
View file @
3cbdcd36
...
...
@@ -104,13 +104,13 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioControlInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioInterface_AC_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
Interface_AC_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_Header
,
.
ACSpecification
=
VERSION_BCD
(
01
.
00
),
.
TotalLength
=
(
sizeof
(
USB_AudioInterface_AC_t
)
+
sizeof
(
USB_AudioInputTerminal_t
)
+
sizeof
(
USB_AudioOutputTerminal_t
)),
.
TotalLength
=
(
sizeof
(
USB_Audio
_
Interface_AC_t
)
+
sizeof
(
USB_Audio
_
InputTerminal_t
)
+
sizeof
(
USB_Audio
_
OutputTerminal_t
)),
.
InCollection
=
1
,
.
InterfaceNumbers
=
{
1
},
...
...
@@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
InputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioInputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
InputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_InputTerminal
,
.
TerminalID
=
0x01
,
...
...
@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
OutputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioOutputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
OutputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_OutputTerminal
,
.
TerminalID
=
0x02
,
...
...
@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioStreamInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioInterface_AS_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
Interface_AS_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_General
,
.
TerminalLink
=
0x02
,
...
...
@@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioFormat
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioFormat_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
Format_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_Format
,
.
FormatType
=
0x01
,
...
...
@@ -199,7 +199,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
SubFrameSize
=
0x02
,
.
BitResolution
=
16
,
.
SampleFrequencyType
=
(
sizeof
(
ConfigurationDescriptor
.
AudioFormat
.
SampleFrequencies
)
/
sizeof
(
AudioSampleFreq_t
)),
.
SampleFrequencyType
=
(
AUDIO_TOTAL_SAMPLE_RATES
*
sizeof
(
USB_
Audio
_
SampleFreq_t
)),
.
SampleFrequencies
=
{
AUDIO_SAMPLE_FREQ
(
AUDIO_SAMPLE_FREQUENCY
)}
},
...
...
@@ -208,7 +208,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.
Endpoint
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioStreamEndpoint_Std_t
),
.
Type
=
DTYPE_Endpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
StreamEndpoint_Std_t
),
.
Type
=
DTYPE_Endpoint
},
.
EndpointAddress
=
(
ENDPOINT_DESCRIPTOR_DIR_IN
|
AUDIO_STREAM_EPNUM
),
.
Attributes
=
(
EP_TYPE_ISOCHRONOUS
|
ENDPOINT_ATTR_SYNC
|
ENDPOINT_USAGE_DATA
),
...
...
@@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioEndpoint_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioStreamEndpoint_Spc_t
),
.
Type
=
DTYPE_AudioEndpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
StreamEndpoint_Spc_t
),
.
Type
=
DTYPE_AudioEndpoint
},
.
Subtype
=
DSUBTYPE_General
,
.
Attributes
=
0x00
,
...
...
Demos/Device/ClassDriver/AudioInput/Descriptors.h
View file @
3cbdcd36
...
...
@@ -68,15 +68,15 @@
{
USB_Descriptor_Configuration_Header_t
Config
;
USB_Descriptor_Interface_t
AudioControlInterface
;
USB_AudioInterface_AC_t
AudioControlInterface_SPC
;
USB_AudioInputTerminal_t
InputTerminal
;
USB_AudioOutputTerminal_t
OutputTerminal
;
USB_Audio
_
Interface_AC_t
AudioControlInterface_SPC
;
USB_Audio
_
InputTerminal_t
InputTerminal
;
USB_Audio
_
OutputTerminal_t
OutputTerminal
;
USB_Descriptor_Interface_t
AudioStreamInterface_Alt0
;
USB_Descriptor_Interface_t
AudioStreamInterface_Alt1
;
USB_AudioInterface_AS_t
AudioStreamInterface_SPC
;
USB_AudioFormat_t
AudioFormat
;
USB_AudioStreamEndpoint_Std_t
AudioEndpoint
;
USB_AudioStreamEndpoint_Spc_t
AudioEndpoint_SPC
;
USB_Audio
_
Interface_AS_t
AudioStreamInterface_SPC
;
USB_Audio
_
Format_t
AudioFormat
;
USB_Audio
_
StreamEndpoint_Std_t
AudioEndpoint
;
USB_Audio
_
StreamEndpoint_Spc_t
AudioEndpoint_SPC
;
}
USB_Descriptor_Configuration_t
;
/* Function Prototypes: */
...
...
Demos/Device/ClassDriver/AudioOutput/Descriptors.c
View file @
3cbdcd36
...
...
@@ -104,13 +104,13 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioControlInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioInterface_AC_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
Interface_AC_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_Header
,
.
ACSpecification
=
VERSION_BCD
(
01
.
00
),
.
TotalLength
=
(
sizeof
(
USB_AudioInterface_AC_t
)
+
sizeof
(
USB_AudioInputTerminal_t
)
+
sizeof
(
USB_AudioOutputTerminal_t
)),
.
TotalLength
=
(
sizeof
(
USB_Audio
_
Interface_AC_t
)
+
sizeof
(
USB_Audio
_
InputTerminal_t
)
+
sizeof
(
USB_Audio
_
OutputTerminal_t
)),
.
InCollection
=
1
,
.
InterfaceNumbers
=
{
1
},
...
...
@@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
InputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioInputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
InputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_InputTerminal
,
.
TerminalID
=
0x01
,
...
...
@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
OutputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioOutputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
OutputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_OutputTerminal
,
.
TerminalID
=
0x02
,
...
...
@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioStreamInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioInterface_AS_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
Interface_AS_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_General
,
.
TerminalLink
=
0x01
,
...
...
@@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioFormat
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioFormat_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
Format_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_Format
,
.
FormatType
=
0x01
,
...
...
@@ -200,7 +200,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
SubFrameSize
=
0x02
,
.
BitResolution
=
16
,
.
SampleFrequencyType
=
(
sizeof
(
ConfigurationDescriptor
.
AudioFormat
.
SampleFrequencies
)
/
sizeof
(
AudioSampleFreq_t
)),
.
SampleFrequencyType
=
(
AUDIO_TOTAL_SAMPLE_RATES
*
sizeof
(
USB_
Audio
_
SampleFreq_t
)),
.
SampleFrequencies
=
{
AUDIO_SAMPLE_FREQ
(
AUDIO_SAMPLE_FREQUENCY
)}
},
...
...
@@ -208,7 +208,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.
Endpoint
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioStreamEndpoint_Std_t
),
.
Type
=
DTYPE_Endpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
StreamEndpoint_Std_t
),
.
Type
=
DTYPE_Endpoint
},
.
EndpointAddress
=
(
ENDPOINT_DESCRIPTOR_DIR_OUT
|
AUDIO_STREAM_EPNUM
),
.
Attributes
=
(
EP_TYPE_ISOCHRONOUS
|
ENDPOINT_ATTR_SYNC
|
ENDPOINT_USAGE_DATA
),
...
...
@@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioEndpoint_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioStreamEndpoint_Spc_t
),
.
Type
=
DTYPE_AudioEndpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
StreamEndpoint_Spc_t
),
.
Type
=
DTYPE_AudioEndpoint
},
.
Subtype
=
DSUBTYPE_General
,
.
Attributes
=
EP_ACCEPTS_SMALL_PACKETS
,
...
...
Demos/Device/ClassDriver/AudioOutput/Descriptors.h
View file @
3cbdcd36
...
...
@@ -68,15 +68,15 @@
{
USB_Descriptor_Configuration_Header_t
Config
;
USB_Descriptor_Interface_t
AudioControlInterface
;
USB_AudioInterface_AC_t
AudioControlInterface_SPC
;
USB_AudioInputTerminal_t
InputTerminal
;
USB_AudioOutputTerminal_t
OutputTerminal
;
USB_Audio
_
Interface_AC_t
AudioControlInterface_SPC
;
USB_Audio
_
InputTerminal_t
InputTerminal
;
USB_Audio
_
OutputTerminal_t
OutputTerminal
;
USB_Descriptor_Interface_t
AudioStreamInterface_Alt0
;
USB_Descriptor_Interface_t
AudioStreamInterface_Alt1
;
USB_AudioInterface_AS_t
AudioStreamInterface_SPC
;
USB_AudioFormat_t
AudioFormat
;
USB_AudioStreamEndpoint_Std_t
AudioEndpoint
;
USB_AudioStreamEndpoint_Spc_t
AudioEndpoint_SPC
;
USB_Audio
_
Interface_AS_t
AudioStreamInterface_SPC
;
USB_Audio
_
Format_t
AudioFormat
;
USB_Audio
_
StreamEndpoint_Std_t
AudioEndpoint
;
USB_Audio
_
StreamEndpoint_Spc_t
AudioEndpoint_SPC
;
}
USB_Descriptor_Configuration_t
;
/* Function Prototypes: */
...
...
Demos/Device/ClassDriver/GenericHID/Descriptors.c
View file @
3cbdcd36
...
...
@@ -130,7 +130,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
GenericHID
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_
HID_
t
),
.
Type
=
DTYPE_HID
},
.
Header
=
{.
Size
=
sizeof
(
USB_
HID_
Descriptor_t
),
.
Type
=
DTYPE_HID
},
.
HIDSpec
=
VERSION_BCD
(
01
.
11
),
.
CountryCode
=
0x00
,
...
...
@@ -227,7 +227,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
break
;
case
DTYPE_HID
:
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
GenericHID
;
Size
=
sizeof
(
USB_Descriptor_
HID_
t
);
Size
=
sizeof
(
USB_
HID_
Descriptor_t
);
break
;
case
DTYPE_Report
:
Address
=
(
void
*
)
&
GenericReport
;
...
...
Demos/Device/ClassDriver/GenericHID/Descriptors.h
View file @
3cbdcd36
...
...
@@ -51,7 +51,7 @@
{
USB_Descriptor_Configuration_Header_t
Config
;
USB_Descriptor_Interface_t
Interface
;
USB_Descriptor_
HID_
t
GenericHID
;
USB_
HID_
Descriptor_t
GenericHID
;
USB_Descriptor_Endpoint_t
GenericINEndpoint
;
}
USB_Descriptor_Configuration_t
;
...
...
Demos/Device/ClassDriver/Joystick/Descriptors.c
View file @
3cbdcd36
...
...
@@ -140,7 +140,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
JoystickHID
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_
HID_
t
),
.
Type
=
DTYPE_HID
},
.
Header
=
{.
Size
=
sizeof
(
USB_
HID_
Descriptor_t
),
.
Type
=
DTYPE_HID
},
.
HIDSpec
=
VERSION_BCD
(
01
.
11
),
.
CountryCode
=
0x00
,
...
...
@@ -237,7 +237,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
break
;
case
DTYPE_HID
:
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
JoystickHID
;
Size
=
sizeof
(
USB_Descriptor_
HID_
t
);
Size
=
sizeof
(
USB_
HID_
Descriptor_t
);
break
;
case
DTYPE_Report
:
Address
=
(
void
*
)
&
JoystickReport
;
...
...
Demos/Device/ClassDriver/Joystick/Descriptors.h
View file @
3cbdcd36
...
...
@@ -51,7 +51,7 @@
{
USB_Descriptor_Configuration_Header_t
Config
;
USB_Descriptor_Interface_t
Interface
;
USB_Descriptor_
HID_
t
JoystickHID
;
USB_
HID_
Descriptor_t
JoystickHID
;
USB_Descriptor_Endpoint_t
JoystickEndpoint
;
}
USB_Descriptor_Configuration_t
;
...
...
Demos/Device/ClassDriver/Keyboard/Descriptors.c
View file @
3cbdcd36
...
...
@@ -147,7 +147,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
KeyboardHID
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_
HID_
t
),
.
Type
=
DTYPE_HID
},
.
Header
=
{.
Size
=
sizeof
(
USB_
HID_
Descriptor_t
),
.
Type
=
DTYPE_HID
},
.
HIDSpec
=
VERSION_BCD
(
01
.
11
),
.
CountryCode
=
0x00
,
...
...
@@ -244,7 +244,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
break
;
case
DTYPE_HID
:
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
KeyboardHID
;
Size
=
sizeof
(
USB_Descriptor_
HID_
t
);
Size
=
sizeof
(
USB_
HID_
Descriptor_t
);
break
;
case
DTYPE_Report
:
Address
=
(
void
*
)
&
KeyboardReport
;
...
...
Demos/Device/ClassDriver/Keyboard/Descriptors.h
View file @
3cbdcd36
...
...
@@ -52,7 +52,7 @@
{
USB_Descriptor_Configuration_Header_t
Config
;
USB_Descriptor_Interface_t
Interface
;
USB_Descriptor_
HID_
t
KeyboardHID
;
USB_
HID_
Descriptor_t
KeyboardHID
;
USB_Descriptor_Endpoint_t
KeyboardEndpoint
;
}
USB_Descriptor_Configuration_t
;
...
...
Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
View file @
3cbdcd36
...
...
@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
KeyboardHID
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_
HID_
t
),
.
Type
=
DTYPE_HID
},
.
Header
=
{.
Size
=
sizeof
(
USB_
HID_
Descriptor_t
),
.
Type
=
DTYPE_HID
},
.
HIDSpec
=
VERSION_BCD
(
01
.
11
),
.
CountryCode
=
0x00
,
...
...
@@ -217,7 +217,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MouseHID
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_
HID_
t
),
.
Type
=
DTYPE_HID
},
.
Header
=
{.
Size
=
sizeof
(
USB_
HID_
Descriptor_t
),
.
Type
=
DTYPE_HID
},
.
HIDSpec
=
VERSION_BCD
(
01
.
11
),
.
CountryCode
=
0x00
,
...
...
@@ -316,12 +316,12 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
if
(
!
(
wIndex
))
{
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
KeyboardHID
;
Size
=
sizeof
(
USB_Descriptor_
HID_
t
);
Size
=
sizeof
(
USB_
HID_
Descriptor_t
);
}
else
{
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
MouseHID
;
Size
=
sizeof
(
USB_Descriptor_
HID_
t
);
Size
=
sizeof
(
USB_
HID_
Descriptor_t
);
}
break
;
case
DTYPE_Report
:
...
...
Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
View file @
3cbdcd36
...
...
@@ -52,10 +52,10 @@
{
USB_Descriptor_Configuration_Header_t
Config
;
USB_Descriptor_Interface_t
KeyboardInterface
;
USB_Descriptor_
HID_
t
KeyboardHID
;
USB_
HID_
Descriptor_t
KeyboardHID
;
USB_Descriptor_Endpoint_t
KeyboardInEndpoint
;
USB_Descriptor_Interface_t
MouseInterface
;
USB_Descriptor_
HID_
t
MouseHID
;
USB_
HID_
Descriptor_t
MouseHID
;
USB_Descriptor_Endpoint_t
MouseInEndpoint
;
}
USB_Descriptor_Configuration_t
;
...
...
Demos/Device/ClassDriver/MIDI/Descriptors.c
View file @
3cbdcd36
...
...
@@ -104,11 +104,11 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioControlInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioInterface_AC_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
Interface_AC_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_Header
,
.
ACSpecification
=
VERSION_BCD
(
01
.
00
),
.
TotalLength
=
sizeof
(
USB_AudioInterface_AC_t
),
.
TotalLength
=
sizeof
(
USB_Audio
_
Interface_AC_t
),
.
InCollection
=
1
,
.
InterfaceNumbers
=
{
1
},
...
...
@@ -132,7 +132,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioStreamInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioInterface_
MIDI_
AS_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_
MIDI_
AudioInterface_AS_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_General
,
.
AudioSpecification
=
VERSION_BCD
(
01
.
00
),
...
...
@@ -196,7 +196,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.
Endpoint
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioStreamEndpoint_Std_t
),
.
Type
=
DTYPE_Endpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
StreamEndpoint_Std_t
),
.
Type
=
DTYPE_Endpoint
},
.
EndpointAddress
=
(
ENDPOINT_DESCRIPTOR_DIR_OUT
|
MIDI_STREAM_OUT_EPNUM
),
.
Attributes
=
(
EP_TYPE_BULK
|
ENDPOINT_ATTR_NO_SYNC
|
ENDPOINT_USAGE_DATA
),
...
...
@@ -221,7 +221,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.
Endpoint
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioStreamEndpoint_Std_t
),
.
Type
=
DTYPE_Endpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
StreamEndpoint_Std_t
),
.
Type
=
DTYPE_Endpoint
},
.
EndpointAddress
=
(
ENDPOINT_DESCRIPTOR_DIR_IN
|
MIDI_STREAM_IN_EPNUM
),
.
Attributes
=
(
EP_TYPE_BULK
|
ENDPOINT_ATTR_NO_SYNC
|
ENDPOINT_USAGE_DATA
),
...
...
Demos/Device/ClassDriver/MIDI/Descriptors.h
View file @
3cbdcd36
...
...
@@ -61,16 +61,16 @@
{
USB_Descriptor_Configuration_Header_t
Config
;
USB_Descriptor_Interface_t
AudioControlInterface
;
USB_AudioInterface_AC_t
AudioControlInterface_SPC
;
USB_Audio
_
Interface_AC_t
AudioControlInterface_SPC
;
USB_Descriptor_Interface_t
AudioStreamInterface
;
USB_AudioInterface_
MIDI_
AS_t
AudioStreamInterface_SPC
;
USB_
MIDI_
AudioInterface_AS_t
AudioStreamInterface_SPC
;
USB_MIDI_In_Jack_t
MIDI_In_Jack_Emb
;
USB_MIDI_In_Jack_t
MIDI_In_Jack_Ext
;
USB_MIDI_Out_Jack_t
MIDI_Out_Jack_Emb
;
USB_MIDI_Out_Jack_t
MIDI_Out_Jack_Ext
;
USB_AudioStreamEndpoint_Std_t
MIDI_In_Jack_Endpoint
;
USB_Audio
_
StreamEndpoint_Std_t
MIDI_In_Jack_Endpoint
;
USB_MIDI_Jack_Endpoint_t
MIDI_In_Jack_Endpoint_SPC
;
USB_AudioStreamEndpoint_Std_t
MIDI_Out_Jack_Endpoint
;
USB_Audio
_
StreamEndpoint_Std_t
MIDI_Out_Jack_Endpoint
;
USB_MIDI_Jack_Endpoint_t
MIDI_Out_Jack_Endpoint_SPC
;
}
USB_Descriptor_Configuration_t
;
...
...
Demos/Device/ClassDriver/MIDI/MIDI.c
View file @
3cbdcd36
...
...
@@ -72,7 +72,7 @@ int main(void)
{
CheckJoystickMovement
();
USB_
MIDI_EventPacket_t
DummyMIDIEvent
;
MIDI_EventPacket_t
DummyMIDIEvent
;
MIDI_Device_ReceiveEventPacket
(
&
Keyboard_MIDI_Interface
,
&
DummyMIDIEvent
);
MIDI_Device_USBTask
(
&
Keyboard_MIDI_Interface
);
...
...
@@ -144,7 +144,7 @@ void CheckJoystickMovement(void)
if
(
MIDICommand
)
{
USB_
MIDI_EventPacket_t
MIDIEvent
=
(
USB_
MIDI_EventPacket_t
)
MIDI_EventPacket_t
MIDIEvent
=
(
MIDI_EventPacket_t
)
{
.
CableNumber
=
0
,
.
Command
=
(
MIDICommand
>>
4
),
...
...
Demos/Device/ClassDriver/Mouse/Descriptors.c
View file @
3cbdcd36
...
...
@@ -140,7 +140,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
MouseHID
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_
HID_
t
),
.
Type
=
DTYPE_HID
},
.
Header
=
{.
Size
=
sizeof
(
USB_
HID_
Descriptor_t
),
.
Type
=
DTYPE_HID
},
.
HIDSpec
=
VERSION_BCD
(
01
.
11
),
.
CountryCode
=
0x00
,
...
...
@@ -237,7 +237,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
break
;
case
DTYPE_HID
:
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
MouseHID
;
Size
=
sizeof
(
USB_Descriptor_
HID_
t
);
Size
=
sizeof
(
USB_
HID_
Descriptor_t
);
break
;
case
DTYPE_Report
:
Address
=
(
void
*
)
&
MouseReport
;
...
...
Demos/Device/ClassDriver/Mouse/Descriptors.h
View file @
3cbdcd36
...
...
@@ -51,7 +51,7 @@
{
USB_Descriptor_Configuration_Header_t
Config
;
USB_Descriptor_Interface_t
Interface
;
USB_Descriptor_
HID_
t
MouseHID
;
USB_
HID_
Descriptor_t
MouseHID
;
USB_Descriptor_Endpoint_t
MouseEndpoint
;
}
USB_Descriptor_Configuration_t
;
...
...
Demos/Device/LowLevel/AudioInput/Descriptors.c
View file @
3cbdcd36
...
...
@@ -104,13 +104,13 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioControlInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioInterface_AC_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
Interface_AC_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_Header
,
.
ACSpecification
=
VERSION_BCD
(
01
.
00
),
.
TotalLength
=
(
sizeof
(
USB_AudioInterface_AC_t
)
+
sizeof
(
USB_AudioInputTerminal_t
)
+
sizeof
(
USB_AudioOutputTerminal_t
)),
.
TotalLength
=
(
sizeof
(
USB_Audio
_
Interface_AC_t
)
+
sizeof
(
USB_Audio
_
InputTerminal_t
)
+
sizeof
(
USB_Audio
_
OutputTerminal_t
)),
.
InCollection
=
1
,
.
InterfaceNumbers
=
{
1
},
...
...
@@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
InputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioInputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
InputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_InputTerminal
,
.
TerminalID
=
0x01
,
...
...
@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
OutputTerminal
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioOutputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
OutputTerminal_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_OutputTerminal
,
.
TerminalID
=
0x02
,
...
...
@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioStreamInterface_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioInterface_AS_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
Interface_AS_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_General
,
.
TerminalLink
=
0x02
,
...
...
@@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioFormat
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioFormat_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
Format_t
),
.
Type
=
DTYPE_AudioInterface
},
.
Subtype
=
DSUBTYPE_Format
,
.
FormatType
=
0x01
,
...
...
@@ -199,7 +199,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
SubFrameSize
=
0x02
,
.
BitResolution
=
16
,
.
SampleFrequencyType
=
(
sizeof
(
ConfigurationDescriptor
.
AudioFormat
.
SampleFrequencies
)
/
sizeof
(
AudioSampleFreq_t
)),
.
SampleFrequencyType
=
(
sizeof
(
ConfigurationDescriptor
.
AudioFormat
.
SampleFrequencies
)
/
sizeof
(
Audio
_
SampleFreq_t
)),
.
SampleFrequencies
=
{
SAMPLE_FREQ
(
AUDIO_SAMPLE_FREQUENCY
)}
},
...
...
@@ -208,7 +208,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.
Endpoint
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioStreamEndpoint_Std_t
),
.
Type
=
DTYPE_Endpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
StreamEndpoint_Std_t
),
.
Type
=
DTYPE_Endpoint
},
.
EndpointAddress
=
(
ENDPOINT_DESCRIPTOR_DIR_IN
|
AUDIO_STREAM_EPNUM
),
.
Attributes
=
(
EP_TYPE_ISOCHRONOUS
|
ENDPOINT_ATTR_SYNC
|
ENDPOINT_USAGE_DATA
),
...
...
@@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.
AudioEndpoint_SPC
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_AudioStreamEndpoint_Spc_t
),
.
Type
=
DTYPE_AudioEndpoint
},
.
Header
=
{.
Size
=
sizeof
(
USB_Audio
_
StreamEndpoint_Spc_t
),
.
Type
=
DTYPE_AudioEndpoint
},
.
Subtype
=
DSUBTYPE_General
,
.
Attributes
=
0x00
,
...
...
Demos/Device/LowLevel/AudioInput/Descriptors.h
View file @
3cbdcd36
...
...
@@ -168,7 +168,7 @@
uint8_t
InCollection
;
/**< Total number of audio class interfaces within this device */
uint8_t
InterfaceNumbers
[
1
];
/**< Interface numbers of each audio interface */
}
USB_AudioInterface_AC_t
;
}
USB_Audio
_
Interface_AC_t
;
/** Type define for an Audio class specific Feature Unit descriptor. This indicates to the host what features
* are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio
...
...
@@ -186,7 +186,7 @@
uint8_t
ChannelControls
[
3
];
/**< Feature masks for the control channel, and each separate audio channel */
uint8_t
FeatureUnitStrIndex
;
/**< Index of a string descriptor describing this descriptor within the device */
}
USB_AudioFeatureUnit_t
;
}
USB_Audio
_
FeatureUnit_t
;
/** Type define for an Audio class specific input terminal descriptor. This indicates to the host that the device
* contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,
...
...
@@ -207,7 +207,7 @@
uint8_t
ChannelStrIndex
;
/**< Index of a string descriptor describing this channel within the device */
uint8_t
TerminalStrIndex
;
/**< Index of a string descriptor describing this descriptor within the device */
}
USB_AudioInputTerminal_t
;
}
USB_Audio
_
InputTerminal_t
;
/** Type define for an Audio class specific output terminal descriptor. This indicates to the host that the device
* contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,
...
...
@@ -226,7 +226,7 @@
uint8_t
SourceID
;
/**< ID value of the unit this terminal's audio is sourced from */
uint8_t
TerminalStrIndex
;
/**< Index of a string descriptor describing this descriptor within the device */
}
USB_AudioOutputTerminal_t
;
}
USB_Audio
_
OutputTerminal_t
;
/** Type define for an Audio class specific streaming interface descriptor. This indicates to the host
* how audio streams within the device are formatted. See the USB Audio specification for more details.
...
...
@@ -240,7 +240,7 @@
uint8_t
FrameDelay
;
/**< Delay in frames resulting from the complete sample processing from input to output */
uint16_t
AudioFormat
;
/**< Format of the audio stream, see Audio Device Formats specification */
}
USB_AudioInterface_AS_t
;
}
USB_Audio
_
Interface_AS_t
;
/** Type define for a 24bit audio sample frequency structure. GCC does not contain a built in 24bit datatype,
* this this structure is used to build up the value instead. Fill this structure with the SAMPLE_FREQ() macro.
...
...
@@ -249,7 +249,7 @@
{
uint16_t
LowWord
;
/**< Low 16 bits of the 24-bit value */
uint8_t
HighByte
;
/**< Upper 8 bits of the 24-bit value */
}
AudioSampleFreq_t
;
}
Audio
_
SampleFreq_t
;
/** Type define for an Audio class specific audio format descriptor. This is used to give the host full details
* about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used
...
...
@@ -267,8 +267,8 @@
uint8_t
BitResolution
;
/**< Bits of resolution of each channel's samples in the stream */
uint8_t
SampleFrequencyType
;
/**< Total number of sample frequencies supported by the device */
AudioSampleFreq_t
SampleFrequencies
[
1
];
/**< Sample frequencies supported by the device */
}
USB_AudioFormat_t
;
Audio
_
SampleFreq_t
SampleFrequencies
[
1
];
/**< Sample frequencies supported by the device */
}
USB_Audio
_
Format_t
;
/** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint
* descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.
...
...
@@ -279,7 +279,7 @@
uint8_t
Refresh
;
/**< Always set to zero */
uint8_t
SyncEndpointNumber
;
/**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */
}
USB_AudioStreamEndpoint_Std_t
;
}
USB_Audio
_
StreamEndpoint_Std_t
;
/** Type define for an Audio class specific extended endpoint descriptor. This contains extra information
* on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio
...
...
@@ -294,7 +294,7 @@
uint8_t
LockDelayUnits
;
/**< Units used for the LockDelay field, see Audio class specification */
uint16_t
LockDelay
;
/**< Time required to internally lock endpoint's internal clock recovery circuitry */
}
USB_AudioStreamEndpoint_Spc_t
;