eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:abcminiuser/lufa

This commit is contained in:
Dean Camera 2013-10-27 18:25:30 +01:00
parent 3fc75f130b e7a8fd6033
commit 13b3014db4
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/Device/ClassDriver/AudioInput/Descriptors.c
View File

@ -113,7 +113,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
sizeof(USB_Audio_Descriptor_OutputTerminal_t)), sizeof(USB_Audio_Descriptor_OutputTerminal_t)),
.InCollection = 1, .InCollection = 1,
.InterfaceNumber = 1, .InterfaceNumber = INTERFACE_ID_AudioStream,
}, },
.Audio_InputTerminal = .Audio_InputTerminal =

2
Demos/Device/ClassDriver/AudioOutput/Descriptors.c
View File

@ -113,7 +113,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
sizeof(USB_Audio_Descriptor_OutputTerminal_t)), sizeof(USB_Audio_Descriptor_OutputTerminal_t)),
.InCollection = 1, .InCollection = 1,
.InterfaceNumber = 1, .InterfaceNumber = INTERFACE_ID_AudioStream,
}, },
.Audio_InputTerminal = .Audio_InputTerminal =

6
Demos/Device/ClassDriver/MIDI/Descriptors.c
View File

@ -90,7 +90,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
.InterfaceNumber = INTERFACE_ID_MidiAudioControl, .InterfaceNumber = INTERFACE_ID_AudioControl,
.AlternateSetting = 0, .AlternateSetting = 0,
.TotalEndpoints = 0, .TotalEndpoints = 0,
@ -111,14 +111,14 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t), .TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t),
.InCollection = 1, .InCollection = 1,
.InterfaceNumber = 1, .InterfaceNumber = INTERFACE_ID_AudioStream,
}, },
.Audio_StreamInterface = .Audio_StreamInterface =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
.InterfaceNumber = INTERFACE_ID_MidiAudioStreaming, .InterfaceNumber = INTERFACE_ID_AudioStream,
.AlternateSetting = 0, .AlternateSetting = 0,
.TotalEndpoints = 2, .TotalEndpoints = 2,

4
Demos/Device/ClassDriver/MIDI/Descriptors.h
View File

@ -83,8 +83,8 @@
*/ */
enum InterfaceDescriptors_t enum InterfaceDescriptors_t
{ {
INTERFACE_ID_MidiAudioControl = 0, /**< MIDI audio control interface descriptor ID */ INTERFACE_ID_AudioControl = 0, /**< Audio control interface descriptor ID */
INTERFACE_ID_MidiAudioStreaming = 1, /**< MIDI audio streaming interface descriptor ID */ INTERFACE_ID_AudioStream = 1, /**< Audio streaming interface descriptor ID */
}; };
/** Enum for the device string descriptor IDs within the device. Each string descriptor should /** Enum for the device string descriptor IDs within the device. Each string descriptor should

2
Demos/Device/ClassDriver/MIDI/MIDI.c
View File

@ -44,7 +44,7 @@ USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface =
{ {
.Config = .Config =
{ {
.StreamingInterfaceNumber = INTERFACE_ID_MidiAudioStreaming, .StreamingInterfaceNumber = INTERFACE_ID_AudioStream,
.DataINEndpoint = .DataINEndpoint =
{ {
.Address = MIDI_STREAM_IN_EPADDR, .Address = MIDI_STREAM_IN_EPADDR,

2
Demos/Device/LowLevel/AudioInput/Descriptors.c
View File

@ -113,7 +113,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
sizeof(USB_Audio_Descriptor_OutputTerminal_t)), sizeof(USB_Audio_Descriptor_OutputTerminal_t)),
.InCollection = 1, .InCollection = 1,
.InterfaceNumber = 1, .InterfaceNumber = INTERFACE_ID_AudioStream,
}, },
.Audio_InputTerminal = .Audio_InputTerminal =

2
Demos/Device/LowLevel/AudioOutput/Descriptors.c
View File

@ -113,7 +113,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
sizeof(USB_Audio_Descriptor_OutputTerminal_t)), sizeof(USB_Audio_Descriptor_OutputTerminal_t)),
.InCollection = 1, .InCollection = 1,
.InterfaceNumber = 1, .InterfaceNumber = INTERFACE_ID_AudioStream,
}, },
.Audio_InputTerminal = .Audio_InputTerminal =

2
Demos/Device/LowLevel/MIDI/Descriptors.c
View File

@ -111,7 +111,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t), .TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t),
.InCollection = 1, .InCollection = 1,
.InterfaceNumber = 1, .InterfaceNumber = INTERFACE_ID_AudioStream,
}, },
.Audio_StreamInterface = .Audio_StreamInterface =

2
Projects/MIDIToneGenerator/Descriptors.c
View File

@ -111,7 +111,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t), .TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t),
.InCollection = 1, .InCollection = 1,
.InterfaceNumber = 1, .InterfaceNumber = INTERFACE_ID_AudioStream,
}, },
.Audio_StreamInterface = .Audio_StreamInterface =