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 4150223..6973a4c 100644 (file)
--- a/Demos/Device/MIDI/Descriptors.c
+++ b/Demos/Device/MIDI/Descriptors.c
@@ -51,7 +51,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
        .SubClass               = 0x00,\r
        .Protocol               = 0x00,\r
                                \r
-       .Endpoint0Size          = 8,\r
+       .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,\r
                \r
        .VendorID               = 0x03EB,\r
        .ProductID              = 0x2048,\r
@@ -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
-                       .JackType                 = JACKTYPE_EMBEDDED,\r
+                       .JackType                 = MIDI_JACKTYPE_EMBEDDED,\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
-                       .JackType                 = JACKTYPE_EXTERNAL,\r
+                       .JackType                 = MIDI_JACKTYPE_EXTERNAL,\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
-                       .JackType                 = JACKTYPE_EMBEDDED,\r
+                       .JackType                 = MIDI_JACKTYPE_EMBEDDED,\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
-                       .JackType                 = JACKTYPE_EXTERNAL,\r
+                       .JackType                 = MIDI_JACKTYPE_EXTERNAL,\r
                        .JackID                   = 0x04,\r
 \r
                        .NumberOfPins             = 1,\r
@@ -276,13 +276,13 @@ USB_Descriptor_String_t PROGMEM ProductString =
        .UnicodeString          = L"LUFA MIDI Demo"\r
 };\r
 \r
-/** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h\r
+/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"\r
  *  documentation) by the application code so that the address and size of a requested descriptor can be given\r
  *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function\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
@@ -293,26 +293,26 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device: \r
-                       Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);\r
+                       Address = (void*)&DeviceDescriptor;\r
                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration: \r
-                       Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);\r
+                       Address = (void*)&ConfigurationDescriptor;\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String: \r
                        switch (DescriptorNumber)\r
                        {\r
                                case 0x00: \r
-                                       Address = DESCRIPTOR_ADDRESS(LanguageString);\r
+                                       Address = (void*)&LanguageString;\r
                                        Size    = pgm_read_byte(&LanguageString.Header.Size);\r
                                        break;\r
                                case 0x01: \r
-                                       Address = DESCRIPTOR_ADDRESS(ManufacturerString);\r
+                                       Address = (void*)&ManufacturerString;\r
                                        Size    = pgm_read_byte(&ManufacturerString.Header.Size);\r
                                        break;\r
                                case 0x02: \r
-                                       Address = DESCRIPTOR_ADDRESS(ProductString);\r
+                                       Address = (void*)&ProductString;\r
                                        Size    = pgm_read_byte(&ProductString.Header.Size);\r
                                        break;\r
                        }\r