diff options
| author | László Monda <laci@monda.hu> | 2013-10-12 00:44:50 +0200 |
|---|---|---|
| committer | László Monda <laci@monda.hu> | 2013-10-12 00:44:50 +0200 |
| commit | cb10891bd6299b840360c2ad97dbecaa6a37c85d (patch) | |
| tree | 3871c4e49a45ad9b07a071d5ac8f58ed84582135 /Demos/Device/ClassDriver | |
| parent | 7024bb4c799b3573627323fa1305142739ed3500 (diff) | |
| download | lufa-cb10891bd6299b840360c2ad97dbecaa6a37c85d.tar.gz lufa-cb10891bd6299b840360c2ad97dbecaa6a37c85d.tar.bz2 lufa-cb10891bd6299b840360c2ad97dbecaa6a37c85d.zip | |
Replace remaining MIDI interface numbers with enums.
Diffstat (limited to 'Demos/Device/ClassDriver')
| -rw-r--r-- | Demos/Device/ClassDriver/AudioInput/Descriptors.c | 2 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/Descriptors.c | 2 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/MIDI/Descriptors.c | 6 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/MIDI/Descriptors.h | 4 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/MIDI/MIDI.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c index a48738735..b65d747c2 100644 --- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c +++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.c @@ -113,7 +113,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = sizeof(USB_Audio_Descriptor_OutputTerminal_t)), .InCollection = 1, - .InterfaceNumber = 1, + .InterfaceNumber = INTERFACE_ID_AudioStream, }, .Audio_InputTerminal = diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c index aec2c5f51..4c3927c81 100644 --- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c +++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c @@ -113,7 +113,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = sizeof(USB_Audio_Descriptor_OutputTerminal_t)), .InCollection = 1, - .InterfaceNumber = 1, + .InterfaceNumber = INTERFACE_ID_AudioStream, }, .Audio_InputTerminal = diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.c b/Demos/Device/ClassDriver/MIDI/Descriptors.c index 746bcc484..541ee8161 100644 --- a/Demos/Device/ClassDriver/MIDI/Descriptors.c +++ b/Demos/Device/ClassDriver/MIDI/Descriptors.c @@ -90,7 +90,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - .InterfaceNumber = INTERFACE_ID_MidiAudioControl, + .InterfaceNumber = INTERFACE_ID_AudioControl, .AlternateSetting = 0, .TotalEndpoints = 0, @@ -111,14 +111,14 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t), .InCollection = 1, - .InterfaceNumber = 1, + .InterfaceNumber = INTERFACE_ID_AudioStream, }, .Audio_StreamInterface = { .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - .InterfaceNumber = INTERFACE_ID_MidiAudioStreaming, + .InterfaceNumber = INTERFACE_ID_AudioStream, .AlternateSetting = 0, .TotalEndpoints = 2, diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.h b/Demos/Device/ClassDriver/MIDI/Descriptors.h index d6f230a8d..9908778c8 100644 --- a/Demos/Device/ClassDriver/MIDI/Descriptors.h +++ b/Demos/Device/ClassDriver/MIDI/Descriptors.h @@ -83,8 +83,8 @@ */ enum InterfaceDescriptors_t { - INTERFACE_ID_MidiAudioControl = 0, /**< MIDI audio control interface descriptor ID */ - INTERFACE_ID_MidiAudioStreaming = 1, /**< MIDI audio streaming interface descriptor ID */ + INTERFACE_ID_AudioControl = 0, /**< Audio control 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 diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c index 79a831762..d49dc4c8c 100644 --- a/Demos/Device/ClassDriver/MIDI/MIDI.c +++ b/Demos/Device/ClassDriver/MIDI/MIDI.c @@ -44,7 +44,7 @@ USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface = { .Config = { - .StreamingInterfaceNumber = INTERFACE_ID_MidiAudioStreaming, + .StreamingInterfaceNumber = INTERFACE_ID_AudioStream, .DataINEndpoint = { .Address = MIDI_STREAM_IN_EPADDR, |