Standardized the naming scheme given to configuration descriptor sub-elements in...

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

diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.c b/Demos/Device/ClassDriver/MIDI/Descriptors.c
index 2c0bb78..4b9e03b 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.c
+++ b/Demos/Device/ClassDriver/MIDI/Descriptors.c
@@ -86,7 +86,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r
                        .MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r

-       .AudioControlInterface = \r
+       .Audio_ControlInterface = \r

                {\r
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
                {\r
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r


@@ -102,7 +102,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .InterfaceStrIndex        = NO_DESCRIPTOR\r
                },\r
        \r
                        .InterfaceStrIndex        = NO_DESCRIPTOR\r
                },\r
        \r

-       .AudioControlInterface_SPC = \r
+       .Audio_ControlInterface_SPC = \r

                {\r
                        .Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_Header,\r
                {\r
                        .Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_Header,\r


@@ -114,7 +114,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .InterfaceNumbers         = {1},\r
                },\r
 \r
                        .InterfaceNumbers         = {1},\r
                },\r
 \r

-       .AudioStreamInterface = \r
+       .Audio_StreamInterface = \r

                {\r
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
                {\r
                        .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r


@@ -130,14 +130,15 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .InterfaceStrIndex        = NO_DESCRIPTOR\r
                },\r
                \r
                        .InterfaceStrIndex        = NO_DESCRIPTOR\r
                },\r
                \r

-       .AudioStreamInterface_SPC = \r
+       .Audio_StreamInterface_SPC = \r

                {\r
                        .Header                   = {.Size = sizeof(USB_MIDI_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_General,\r
 \r
                        .AudioSpecification       = VERSION_BCD(01.00),\r
                        \r
                {\r
                        .Header                   = {.Size = sizeof(USB_MIDI_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_General,\r
 \r
                        .AudioSpecification       = VERSION_BCD(01.00),\r
                        \r

-                       .TotalLength              = (sizeof(USB_Descriptor_Configuration_t) - offsetof(USB_Descriptor_Configuration_t, AudioStreamInterface_SPC))\r
+                       .TotalLength              = (sizeof(USB_Descriptor_Configuration_t) -\r
+                                                    offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC))\r

                },\r
 \r
        .MIDI_In_Jack_Emb = \r
                },\r
 \r
        .MIDI_In_Jack_Emb = \r