projects / pub / USBasp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 7024bb4)
Replace remaining MIDI interface numbers with enums.
authorLászló Monda <laci@monda.hu>
Fri, 11 Oct 2013 22:44:50 +0000 (00:44 +0200)
committerLászló Monda <laci@monda.hu>
Fri, 11 Oct 2013 22:44:50 +0000 (00:44 +0200)
Demos/Device/ClassDriver/AudioInput/Descriptors.c patch | blob | blame | history
Demos/Device/ClassDriver/AudioOutput/Descriptors.c patch | blob | blame | history
Demos/Device/ClassDriver/MIDI/Descriptors.c patch | blob | blame | history
Demos/Device/ClassDriver/MIDI/Descriptors.h patch | blob | blame | history
Demos/Device/ClassDriver/MIDI/MIDI.c patch | blob | blame | history
Demos/Device/LowLevel/AudioInput/Descriptors.c patch | blob | blame | history
Demos/Device/LowLevel/AudioOutput/Descriptors.c patch | blob | blame | history
Demos/Device/LowLevel/MIDI/Descriptors.c patch | blob | blame | history
Projects/MIDIToneGenerator/Descriptors.c patch | blob | blame | history

diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
index a487387..b65d747 100644 (file)
--- 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,
                                                     sizeof(USB_Audio_Descriptor_OutputTerminal_t)),
 
                        .InCollection             = 1,
-                       .InterfaceNumber          = 1,
+                       .InterfaceNumber          = INTERFACE_ID_AudioStream,
                },
 
        .Audio_InputTerminal =
                },
 
        .Audio_InputTerminal =
diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c
index aec2c5f..4c3927c 100644 (file)
--- 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,
                                                     sizeof(USB_Audio_Descriptor_OutputTerminal_t)),
 
                        .InCollection             = 1,
-                       .InterfaceNumber          = 1,
+                       .InterfaceNumber          = INTERFACE_ID_AudioStream,
                },
 
        .Audio_InputTerminal =
                },
 
        .Audio_InputTerminal =
diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.c b/Demos/Device/ClassDriver/MIDI/Descriptors.c
index 746bcc4..541ee81 100644 (file)
--- 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},
 
                {
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
-                       .InterfaceNumber          = INTERFACE_ID_MidiAudioControl,
+                       .InterfaceNumber          = INTERFACE_ID_AudioControl,
                        .AlternateSetting         = 0,
 
                        .TotalEndpoints           = 0,
                        .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,
                        .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},
 
                },
 
        .Audio_StreamInterface =
                {
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
-                       .InterfaceNumber          = INTERFACE_ID_MidiAudioStreaming,
+                       .InterfaceNumber          = INTERFACE_ID_AudioStream,
                        .AlternateSetting         = 0,
 
                        .TotalEndpoints           = 2,
                        .AlternateSetting         = 0,
 
                        .TotalEndpoints           = 2,
diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.h b/Demos/Device/ClassDriver/MIDI/Descriptors.h
index d6f230a..9908778 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.h
+++ b/Demos/Device/ClassDriver/MIDI/Descriptors.h
@@ -83,8 +83,8 @@
                 */
                enum InterfaceDescriptors_t
                {
                 */
                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
                };
 
                /** 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 79a8317..d49dc4c 100644 (file)
--- 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 =
                        {
        {
                .Config =
                        {
-                               .StreamingInterfaceNumber = INTERFACE_ID_MidiAudioStreaming,
+                               .StreamingInterfaceNumber = INTERFACE_ID_AudioStream,
                                .DataINEndpoint           =
                                        {
                                                .Address          = MIDI_STREAM_IN_EPADDR,
                                .DataINEndpoint           =
                                        {
                                                .Address          = MIDI_STREAM_IN_EPADDR,
diff --git a/Demos/Device/LowLevel/AudioInput/Descriptors.c b/Demos/Device/LowLevel/AudioInput/Descriptors.c
index 444f160..8521199 100644 (file)
--- a/Demos/Device/LowLevel/AudioInput/Descriptors.c
+++ b/Demos/Device/LowLevel/AudioInput/Descriptors.c
@@ -113,7 +113,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                                                     sizeof(USB_Audio_Descriptor_OutputTerminal_t)),
 
                        .InCollection             = 1,
                                                     sizeof(USB_Audio_Descriptor_OutputTerminal_t)),
 
                        .InCollection             = 1,
-                       .InterfaceNumber          = 1,
+                       .InterfaceNumber          = INTERFACE_ID_AudioStream,
                },
 
        .Audio_InputTerminal =
                },
 
        .Audio_InputTerminal =
diff --git a/Demos/Device/LowLevel/AudioOutput/Descriptors.c b/Demos/Device/LowLevel/AudioOutput/Descriptors.c
index 7879c34..6505bb3 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/Descriptors.c
+++ b/Demos/Device/LowLevel/AudioOutput/Descriptors.c
@@ -113,7 +113,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                                                     sizeof(USB_Audio_Descriptor_OutputTerminal_t)),
 
                        .InCollection             = 1,
                                                     sizeof(USB_Audio_Descriptor_OutputTerminal_t)),
 
                        .InCollection             = 1,
-                       .InterfaceNumber          = 1,
+                       .InterfaceNumber          = INTERFACE_ID_AudioStream,
                },
 
        .Audio_InputTerminal =
                },
 
        .Audio_InputTerminal =
diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.c b/Demos/Device/LowLevel/MIDI/Descriptors.c
index 220d37d..541ee81 100644 (file)
--- a/Demos/Device/LowLevel/MIDI/Descriptors.c
+++ b/Demos/Device/LowLevel/MIDI/Descriptors.c
@@ -111,7 +111,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .TotalLength              = sizeof(USB_Audio_Descriptor_Interface_AC_t),
 
                        .InCollection             = 1,
                        .TotalLength              = sizeof(USB_Audio_Descriptor_Interface_AC_t),
 
                        .InCollection             = 1,
-                       .InterfaceNumber          = 1,
+                       .InterfaceNumber          = INTERFACE_ID_AudioStream,
                },
 
        .Audio_StreamInterface =
                },
 
        .Audio_StreamInterface =
diff --git a/Projects/MIDIToneGenerator/Descriptors.c b/Projects/MIDIToneGenerator/Descriptors.c
index 220d37d..541ee81 100644 (file)
--- a/Projects/MIDIToneGenerator/Descriptors.c
+++ b/Projects/MIDIToneGenerator/Descriptors.c
@@ -111,7 +111,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .TotalLength              = sizeof(USB_Audio_Descriptor_Interface_AC_t),
 
                        .InCollection             = 1,
                        .TotalLength              = sizeof(USB_Audio_Descriptor_Interface_AC_t),
 
                        .InCollection             = 1,
-                       .InterfaceNumber          = 1,
+                       .InterfaceNumber          = INTERFACE_ID_AudioStream,
                },
 
        .Audio_StreamInterface =
                },
 
        .Audio_StreamInterface =
USB isp AVR programmer