Move class-specific functional descriptor definitions to their respective classes.

[pub/USBasp.git] / Demos / Device / ClassDriver / DualMIDI / Descriptors.c

diff --git a/Demos/Device/ClassDriver/DualMIDI/Descriptors.c b/Demos/Device/ClassDriver/DualMIDI/Descriptors.c
index 5cc6f11..c735d1c 100644 (file)
--- a/Demos/Device/ClassDriver/DualMIDI/Descriptors.c
+++ b/Demos/Device/ClassDriver/DualMIDI/Descriptors.c
@@ -104,7 +104,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .Audio_ControlInterface_SPC =
                {
 
        .Audio_ControlInterface_SPC =
                {

-                       .Header                   = {.Size = sizeof(USB_Audio_Descriptor_Interface_AC_t), .Type = DTYPE_CSInterface},
+                       .Header                   = {.Size = sizeof(USB_Audio_Descriptor_Interface_AC_t), .Type = AUDIO_DTYPE_CSInterface},

                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_Header,
 
                        .ACSpecification          = VERSION_BCD(1,0,0),
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_Header,
 
                        .ACSpecification          = VERSION_BCD(1,0,0),


@@ -132,7 +132,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .Audio_StreamInterface_SPC =
                {
 
        .Audio_StreamInterface_SPC =
                {

-                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_AudioInterface_AS_t), .Type = DTYPE_CSInterface},
+                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_AudioInterface_AS_t), .Type = AUDIO_DTYPE_CSInterface},

                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_General,
 
                        .AudioSpecification       = VERSION_BCD(1,0,0),
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_General,
 
                        .AudioSpecification       = VERSION_BCD(1,0,0),


@@ -143,7 +143,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .MIDI_In_Jack_Emb =
                {
 
        .MIDI_In_Jack_Emb =
                {

-                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},
+                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = AUDIO_DTYPE_CSInterface},

                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_Embedded,
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_Embedded,


@@ -154,7 +154,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .MIDI_In_Jack_Emb2 =
                {
 
        .MIDI_In_Jack_Emb2 =
                {

-                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},
+                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = AUDIO_DTYPE_CSInterface},

                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_Embedded,
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_Embedded,


@@ -165,7 +165,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .MIDI_In_Jack_Ext =
                {
 
        .MIDI_In_Jack_Ext =
                {

-                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},
+                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = AUDIO_DTYPE_CSInterface},

                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_External,
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_External,


@@ -176,7 +176,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .MIDI_In_Jack_Ext2 =
                {
 
        .MIDI_In_Jack_Ext2 =
                {

-                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},
+                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = AUDIO_DTYPE_CSInterface},

                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_External,
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_External,


@@ -187,7 +187,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .MIDI_Out_Jack_Emb =
                {
 
        .MIDI_Out_Jack_Emb =
                {

-                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},
+                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = AUDIO_DTYPE_CSInterface},

                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_Embedded,
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_Embedded,


@@ -202,7 +202,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .MIDI_Out_Jack_Emb2 =
                {
 
        .MIDI_Out_Jack_Emb2 =
                {

-                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},
+                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = AUDIO_DTYPE_CSInterface},

                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_Embedded,
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_Embedded,


@@ -217,7 +217,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .MIDI_Out_Jack_Ext =
                {
 
        .MIDI_Out_Jack_Ext =
                {

-                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},
+                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = AUDIO_DTYPE_CSInterface},

                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_External,
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_External,


@@ -232,7 +232,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .MIDI_Out_Jack_Ext2 =
                {
 
        .MIDI_Out_Jack_Ext2 =
                {

-                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},
+                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = AUDIO_DTYPE_CSInterface},

                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_External,
                        .Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
 
                        .JackType                 = MIDI_JACKTYPE_External,


@@ -263,7 +263,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .MIDI_In_Jack_Endpoint_SPC =
                {
 
        .MIDI_In_Jack_Endpoint_SPC =
                {

-                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_DualJack_Endpoint_t), .Type = DTYPE_CSEndpoint},
+                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_DualJack_Endpoint_t), .Type = AUDIO_DTYPE_CSEndpoint},

                        .Subtype                  = AUDIO_DSUBTYPE_CSEndpoint_General,
 
                        .TotalEmbeddedJacks       = 0x02,
                        .Subtype                  = AUDIO_DSUBTYPE_CSEndpoint_General,
 
                        .TotalEmbeddedJacks       = 0x02,


@@ -288,7 +288,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .MIDI_Out_Jack_Endpoint_SPC =
                {
 
        .MIDI_Out_Jack_Endpoint_SPC =
                {

-                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_DualJack_Endpoint_t), .Type = DTYPE_CSEndpoint},
+                       .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_DualJack_Endpoint_t), .Type = AUDIO_DTYPE_CSEndpoint},

                        .Subtype                  = AUDIO_DSUBTYPE_CSEndpoint_General,
 
                        .TotalEmbeddedJacks       = 0x02,
                        .Subtype                  = AUDIO_DSUBTYPE_CSEndpoint_General,
 
                        .TotalEmbeddedJacks       = 0x02,