Fixed MIDI_Host_Flush() not aborting early when the specified MIDI host interface...

[pub/USBasp.git] / Demos / Device / LowLevel / MIDI / Descriptors.h

diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.h b/Demos/Device/LowLevel/MIDI/Descriptors.h
index 672d08a..e110cc2 100644 (file)
--- a/Demos/Device/LowLevel/MIDI/Descriptors.h
+++ b/Demos/Device/LowLevel/MIDI/Descriptors.h
@@ -42,14 +42,8 @@
                #include <avr/pgmspace.h>
 
        /* Macros: */
-               /** Descriptor header constant to indicate a Audio class interface descriptor. */
-               #define DTYPE_AudioInterface        0x24
-
-               /** Descriptor header constant to indicate a Audio class endpoint descriptor. */
-               #define DTYPE_AudioEndpoint         0x25
-
                /** Audio class descriptor subtype value for a Audio class specific header descriptor. */
-               #define DSUBTYPE_Header             0x01
+               #define DSUBTYPE_AudioHeader        0x01
 
                /** Audio class descriptor subtype value for a Audio class specific MIDI input jack descriptor. */
                #define DSUBTYPE_InputJack          0x02
@@ -66,11 +60,11 @@
                /** Audio class descriptor jack type value for an external (physical) MIDI input or output jack. */
                #define JACKTYPE_EXTERNAL           0x02
                
-               /** Endpoint number of the MIDI streaming data OUT endpoint, for host-to-device data transfers. */
-               #define MIDI_STREAM_OUT_EPNUM       1
-
                /** Endpoint number of the MIDI streaming data IN endpoint, for device-to-host data transfers. */
-               #define MIDI_STREAM_IN_EPNUM        2
+               #define MIDI_STREAM_IN_EPNUM        1
+
+               /** Endpoint number of the MIDI streaming data OUT endpoint, for host-to-device data transfers. */
+               #define MIDI_STREAM_OUT_EPNUM       2
 
                /** Endpoint size in bytes of the Audio isochronous streaming data IN and OUT endpoints. */
                #define MIDI_STREAM_EPSIZE          64
@@ -85,11 +79,11 @@
                        USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
                        uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
 
-                       uint16_t                  ACSpecification; /** Binary coded decimal value, indicating the supported Audio Class specification version */
-                       uint16_t                  TotalLength; /** Total length of the Audio class specific control descriptors, including this descriptor */
+                       uint16_t                  AudioSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */
+                       uint16_t                  TotalLength; /**< Total length of the Audio class specific control descriptors, including this descriptor */
                        
-                       uint8_t                   InCollection; /** Total number of audio class interfaces within this device */
-                       uint8_t                   InterfaceNumbers[1]; /** Interface numbers of each audio interface */
+                       uint8_t                   InCollection; /**< Total number of audio class interfaces within this device */
+                       uint8_t                   InterfaceNumbers[1]; /**< Interface numbers of each audio interface */
                } USB_Audio_Interface_AC_t;
                
                /** Type define for an Audio class specific MIDI streaming interface descriptor. This indicates to the host
@@ -183,7 +177,9 @@
                } USB_Descriptor_Configuration_t;
                
        /* Function Prototypes: */
-               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
-                                                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                                   const uint8_t wIndex,
+                                                   const void** const DescriptorAddress)
+                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif