Fix Doxygen errors in demos.

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

diff --git a/Demos/Device/MIDI/Descriptors.c b/Demos/Device/MIDI/Descriptors.c
index d425411..6973a4c 100644 (file)
--- a/Demos/Device/MIDI/Descriptors.c
+++ b/Demos/Device/MIDI/Descriptors.c
@@ -145,7 +145,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                   = {.Size = sizeof(USB_MIDI_In_Jack_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_InputJack,\r
                        \r
                        .Header                   = {.Size = sizeof(USB_MIDI_In_Jack_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_InputJack,\r
                        \r

-                       .JackType                 = JACKTYPE_EMBEDDED,\r
+                       .JackType                 = MIDI_JACKTYPE_EMBEDDED,\r

                        .JackID                   = 0x01,\r
                        \r
                        .JackStrIndex             = NO_DESCRIPTOR\r
                        .JackID                   = 0x01,\r
                        \r
                        .JackStrIndex             = NO_DESCRIPTOR\r


@@ -156,7 +156,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                   = {.Size = sizeof(USB_MIDI_In_Jack_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_InputJack,\r
                        \r
                        .Header                   = {.Size = sizeof(USB_MIDI_In_Jack_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_InputJack,\r
                        \r

-                       .JackType                 = JACKTYPE_EXTERNAL,\r
+                       .JackType                 = MIDI_JACKTYPE_EXTERNAL,\r

                        .JackID                   = 0x02,\r
                        \r
                        .JackStrIndex             = NO_DESCRIPTOR\r
                        .JackID                   = 0x02,\r
                        \r
                        .JackStrIndex             = NO_DESCRIPTOR\r


@@ -167,7 +167,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                   = {.Size = sizeof(USB_MIDI_Out_Jack_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_OutputJack,\r
                        \r
                        .Header                   = {.Size = sizeof(USB_MIDI_Out_Jack_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_OutputJack,\r
                        \r

-                       .JackType                 = JACKTYPE_EMBEDDED,\r
+                       .JackType                 = MIDI_JACKTYPE_EMBEDDED,\r

                        .JackID                   = 0x03,\r
 \r
                        .NumberOfPins             = 1,\r
                        .JackID                   = 0x03,\r
 \r
                        .NumberOfPins             = 1,\r


@@ -182,7 +182,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                   = {.Size = sizeof(USB_MIDI_Out_Jack_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_OutputJack,\r
                        \r
                        .Header                   = {.Size = sizeof(USB_MIDI_Out_Jack_t), .Type = DTYPE_AudioInterface},\r
                        .Subtype                  = DSUBTYPE_OutputJack,\r
                        \r

-                       .JackType                 = JACKTYPE_EXTERNAL,\r
+                       .JackType                 = MIDI_JACKTYPE_EXTERNAL,\r

                        .JackID                   = 0x04,\r
 \r
                        .NumberOfPins             = 1,\r
                        .JackID                   = 0x04,\r
 \r
                        .NumberOfPins             = 1,\r


@@ -282,7 +282,7 @@ USB_Descriptor_String_t PROGMEM ProductString =
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the\r
  *  USB host.\r
  */\r
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the\r
  *  USB host.\r
  */\r

-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r

 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r
        const uint8_t  DescriptorNumber = (wValue & 0xFF);\r
 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r
        const uint8_t  DescriptorNumber = (wValue & 0xFF);\r