projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move RNDISConstants.h into the RNDIS class driver common definition header.
[pub/USBasp.git]
/
Demos
/
Device
/
LowLevel
/
MIDI
/
Descriptors.c
diff --git
a/Demos/Device/LowLevel/MIDI/Descriptors.c
b/Demos/Device/LowLevel/MIDI/Descriptors.c
index
5640c67
..
d906f66
100644
(file)
--- a/
Demos/Device/LowLevel/MIDI/Descriptors.c
+++ b/
Demos/Device/LowLevel/MIDI/Descriptors.c
@@
-3,7
+3,7
@@
Copyright (C) Dean Camera, 2010.
dean [at] fourwalledcubicle [dot] com
Copyright (C) Dean Camera, 2010.
dean [at] fourwalledcubicle [dot] com
- www.fourwalledcubicle.com
+ www.lufa-lib.org
*/
/*
*/
/*
@@
-47,9
+47,9
@@
USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
.USBSpecification = VERSION_BCD(01.10),
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
.USBSpecification = VERSION_BCD(01.10),
- .Class =
0x00
,
- .SubClass =
0x00
,
- .Protocol =
0x00
,
+ .Class =
USB_CSCP_NoDeviceClass
,
+ .SubClass =
USB_CSCP_NoDeviceSubclass
,
+ .Protocol =
USB_CSCP_NoDeviceProtocol
,
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
@@
-95,23
+95,23
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TotalEndpoints = 0,
.TotalEndpoints = 0,
- .Class =
0x01
,
- .SubClass =
0x01
,
- .Protocol =
0x00
,
+ .Class =
AUDIO_CSCP_AudioClass
,
+ .SubClass =
AUDIO_CSCP_ControlSubclass
,
+ .Protocol =
AUDIO_CSCP_ControlProtocol
,
.InterfaceStrIndex = NO_DESCRIPTOR
},
.Audio_ControlInterface_SPC =
{
.InterfaceStrIndex = NO_DESCRIPTOR
},
.Audio_ControlInterface_SPC =
{
- .Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_CSInterface},
- .Subtype =
DSUBTYPE_Audio
Header,
+ .Header = {.Size = sizeof(USB_Audio_
Descriptor_
Interface_AC_t), .Type = DTYPE_CSInterface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface_
Header,
- .A
udioSpecification
= VERSION_BCD(01.00),
- .TotalLength = sizeof(USB_Audio_Interface_AC_t),
+ .A
CSpecification
= VERSION_BCD(01.00),
+ .TotalLength = sizeof(USB_Audio_
Descriptor_
Interface_AC_t),
.InCollection = 1,
.InCollection = 1,
- .InterfaceNumber
s = {1}
,
+ .InterfaceNumber
= 1
,
},
.Audio_StreamInterface =
},
.Audio_StreamInterface =
@@
-123,17
+123,17
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TotalEndpoints = 2,
.TotalEndpoints = 2,
- .Class =
0x01
,
- .SubClass =
0x03
,
- .Protocol =
0x00
,
+ .Class =
AUDIO_CSCP_AudioClass
,
+ .SubClass =
AUDIO_CSCP_MIDIStreamingSubclass
,
+ .Protocol =
AUDIO_CSCP_StreamingProtocol
,
.InterfaceStrIndex = NO_DESCRIPTOR
},
.Audio_StreamInterface_SPC =
{
.InterfaceStrIndex = NO_DESCRIPTOR
},
.Audio_StreamInterface_SPC =
{
- .Header = {.Size = sizeof(USB_
Audio_Interface_MIDI
_AS_t), .Type = DTYPE_CSInterface},
- .Subtype =
DSUBTYPE
_General,
+ .Header = {.Size = sizeof(USB_
MIDI_Descriptor_AudioInterface
_AS_t), .Type = DTYPE_CSInterface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface
_General,
.AudioSpecification = VERSION_BCD(01.00),
.AudioSpecification = VERSION_BCD(01.00),
@@
-143,10
+143,10
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.MIDI_In_Jack_Emb =
{
.MIDI_In_Jack_Emb =
{
- .Header = {.Size = sizeof(USB_MIDI_
In_
Jack_t), .Type = DTYPE_CSInterface},
- .Subtype =
DSUBTYPE_InputJack
,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_Input
Jack_t), .Type = DTYPE_CSInterface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
- .JackType =
JACKTYPE_EMBEDDED
,
+ .JackType =
MIDI_JACKTYPE_Embedded
,
.JackID = 0x01,
.JackStrIndex = NO_DESCRIPTOR
.JackID = 0x01,
.JackStrIndex = NO_DESCRIPTOR
@@
-154,10
+154,10
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.MIDI_In_Jack_Ext =
{
.MIDI_In_Jack_Ext =
{
- .Header = {.Size = sizeof(USB_MIDI_
In_
Jack_t), .Type = DTYPE_CSInterface},
- .Subtype =
DSUBTYPE_InputJack
,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_Input
Jack_t), .Type = DTYPE_CSInterface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface_InputTerminal
,
- .JackType =
JACKTYPE_EXTERNAL
,
+ .JackType =
MIDI_JACKTYPE_External
,
.JackID = 0x02,
.JackStrIndex = NO_DESCRIPTOR
.JackID = 0x02,
.JackStrIndex = NO_DESCRIPTOR
@@
-165,10
+165,10
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.MIDI_Out_Jack_Emb =
{
.MIDI_Out_Jack_Emb =
{
- .Header = {.Size = sizeof(USB_MIDI_
Out_
Jack_t), .Type = DTYPE_CSInterface},
- .Subtype =
DSUBTYPE_OutputJack
,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_Output
Jack_t), .Type = DTYPE_CSInterface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
- .JackType =
JACKTYPE_EMBEDDED
,
+ .JackType =
MIDI_JACKTYPE_Embedded
,
.JackID = 0x03,
.NumberOfPins = 1,
.JackID = 0x03,
.NumberOfPins = 1,
@@
-180,10
+180,10
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.MIDI_Out_Jack_Ext =
{
.MIDI_Out_Jack_Ext =
{
- .Header = {.Size = sizeof(USB_MIDI_
Out_
Jack_t), .Type = DTYPE_CSInterface},
- .Subtype =
DSUBTYPE_OutputJack
,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_Output
Jack_t), .Type = DTYPE_CSInterface},
+ .Subtype =
AUDIO_DSUBTYPE_CSInterface_OutputTerminal
,
- .JackType =
JACKTYPE_EXTERNAL
,
+ .JackType =
MIDI_JACKTYPE_External
,
.JackID = 0x04,
.NumberOfPins = 1,
.JackID = 0x04,
.NumberOfPins = 1,
@@
-197,7
+197,7
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.Endpoint =
{
{
.Endpoint =
{
- .Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
+ .Header = {.Size = sizeof(USB_Audio_
Descriptor_
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),
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | MIDI_STREAM_OUT_EPNUM),
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
@@
-211,8
+211,8
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.MIDI_In_Jack_Endpoint_SPC =
{
.MIDI_In_Jack_Endpoint_SPC =
{
- .Header = {.Size = sizeof(USB_MIDI_Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},
- .Subtype =
DSUBTYPE
_General,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_
Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},
+ .Subtype =
AUDIO_DSUBTYPE_CSEndpoint
_General,
.TotalEmbeddedJacks = 0x01,
.AssociatedJackID = {0x01}
.TotalEmbeddedJacks = 0x01,
.AssociatedJackID = {0x01}
@@
-222,7
+222,7
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.Endpoint =
{
{
.Endpoint =
{
- .Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
+ .Header = {.Size = sizeof(USB_Audio_
Descriptor_
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),
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | MIDI_STREAM_IN_EPNUM),
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
@@
-236,8
+236,8
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.MIDI_Out_Jack_Endpoint_SPC =
{
.MIDI_Out_Jack_Endpoint_SPC =
{
- .Header = {.Size = sizeof(USB_MIDI_Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},
- .Subtype =
DSUBTYPE
_General,
+ .Header = {.Size = sizeof(USB_MIDI_
Descriptor_
Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},
+ .Subtype =
AUDIO_DSUBTYPE_CSEndpoint
_General,
.TotalEmbeddedJacks = 0x01,
.AssociatedJackID = {0x03}
.TotalEmbeddedJacks = 0x01,
.AssociatedJackID = {0x03}
projects / pub / USBasp.git / blobdiff