Minor documentation page updates.

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Device / MIDI.h

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDI.h
index 1782393..890d3bb 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.h
@@ -37,6 +37,11 @@
 \r
                #include <string.h>\r
 \r
 \r
                #include <string.h>\r
 \r

+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r

        /* Macros: */\r
                /** Audio class descriptor subtype value for a Audio class specific MIDI input jack descriptor. */\r
                #define DSUBTYPE_InputJack          0x02\r
        /* Macros: */\r
                /** Audio class descriptor subtype value for a Audio class specific MIDI input jack descriptor. */\r
                #define DSUBTYPE_InputJack          0x02\r


@@ -45,10 +50,10 @@
                #define DSUBTYPE_OutputJack         0x03\r
                \r
                /** Audio class descriptor jack type value for an embedded (logical) MIDI input or output jack. */\r
                #define DSUBTYPE_OutputJack         0x03\r
                \r
                /** Audio class descriptor jack type value for an embedded (logical) MIDI input or output jack. */\r

-               #define JACKTYPE_EMBEDDED           0x01\r
+               #define MIDI_JACKTYPE_EMBEDDED      0x01\r

 \r
                /** Audio class descriptor jack type value for an external (physical) MIDI input or output jack. */\r
 \r
                /** Audio class descriptor jack type value for an external (physical) MIDI input or output jack. */\r

-               #define JACKTYPE_EXTERNAL           0x02\r
+               #define MIDI_JACKTYPE_EXTERNAL      0x02\r

 \r
                /** MIDI command for a note on (activation) event */\r
                #define MIDI_COMMAND_NOTE_ON        0x09\r
 \r
                /** MIDI command for a note on (activation) event */\r
                #define MIDI_COMMAND_NOTE_ON        0x09\r


@@ -137,7 +142,7 @@
 \r
                typedef struct\r
                {\r
 \r
                typedef struct\r
                {\r

-                       uint8_t  InterfaceNumber;\r
+                       uint8_t  StreamingInterfaceNumber;\r

 \r
                        uint8_t  DataINEndpointNumber;\r
                        uint16_t DataINEndpointSize;\r
 \r
                        uint8_t  DataINEndpointNumber;\r
                        uint16_t DataINEndpointSize;\r


@@ -155,4 +160,9 @@
                void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);\r
                bool USB_MIDI_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);\r
 \r
                void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);\r
                bool USB_MIDI_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);\r
 \r

+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+               \r

 #endif\r
 #endif\r