Reduce struct name pollution - group typedef struct names by class driver name where...

[pub/lufa.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 2cadeaf..e81089c 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.h
@@ -55,22 +55,10 @@
        /* Public Interface - May be used in end-application: */\r
                /* Type Define: */\r
                        /** Configuration information structure for \ref USB_ClassInfo_MIDI_Device_t MIDI device interface structures. */\r
-                       typedef struct\r
-                       {\r
-                               uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this structure controls */\r
-\r
-                               uint8_t  DataINEndpointNumber; /**< Endpoint number of the incomming MIDI data, if available (zero if unused) */\r
-                               uint16_t DataINEndpointSize; /**< Size in bytes of the incomming MIDI data endpoint, if available (zero if unused) */\r
-\r
-                               uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the outgoing MIDI data, if available (zero if unused) */\r
-                               uint16_t DataOUTEndpointSize; /**< Size in bytes of the outgoing MIDI data endpoint, if available (zero if unused) */\r
-                       } USB_ClassInfo_MIDI_Device_Config_t;\r
+                       typedef  USB_ClassInfo_MIDI_Device_Config_t;\r
        \r
                        /** Current State information structure for \ref USB_ClassInfo_MIDI_Device_t MIDI device interface structures. */\r
-                       typedef struct\r
-                       {\r
-                               // No state information for this class yet\r
-                       } USB_ClassInfo_MIDI_Device_State_t;\r
+                       typedef  USB_ClassInfo_MIDI_Device_State_t;\r
        \r
                        /** Class state structure. An instance of this structure should be made for each MIDI interface\r
                         *  within the user application, and passed to each of the MIDI class driver functions as the\r
@@ -78,18 +66,25 @@
                         */\r
                        typedef struct\r
                        {\r
-                               const USB_ClassInfo_MIDI_Device_Config_t Config; /**< Config data for the USB class interface within\r
-                                                                                 *   the device. All elements in this section\r
-                                                                                 *   <b>must</b> be set or the interface will fail\r
-                                                                                 *   to enumerate and operate correctly.\r
-                                                                                 */\r
-                                                                                                                        \r
-                               USB_ClassInfo_MIDI_Device_State_t State; /**< State data for the USB class interface within\r
-                                                                         *   the device. All elements in this section\r
-                                                                         *   <b>may</b> be set to initial values, but may\r
-                                                                         *   also be ignored to default to sane values when\r
-                                                                         *   the interface is enumerated.\r
-                                                                         */\r
+                               const struct\r
+                               {\r
+                                       uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this structure controls */\r
+\r
+                                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the incomming MIDI data, if available (zero if unused) */\r
+                                       uint16_t DataINEndpointSize; /**< Size in bytes of the incomming MIDI data endpoint, if available (zero if unused) */\r
+\r
+                                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the outgoing MIDI data, if available (zero if unused) */\r
+                                       uint16_t DataOUTEndpointSize; /**< Size in bytes of the outgoing MIDI data endpoint, if available (zero if unused) */\r
+                               } Config; /**< Config data for the USB class interface within the device. All elements in this section\r
+                                          *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.\r
+                                          */                                                                    \r
+                               struct\r
+                               {\r
+                                       // No state information for this class yet\r
+                               } State; /**< State data for the USB class interface within the device. All elements in this section\r
+                                         *   <b>may</b> be set to initial values, but may also be ignored to default to sane values when\r
+                                         *   the interface is enumerated.\r
+                                         */\r
                        } USB_ClassInfo_MIDI_Device_t;  \r
        \r
                /* Function Prototypes: */\r
@@ -122,7 +117,7 @@
                         *  \param MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state.\r
                         *  \param Event  Pointer to a populated USB_MIDI_EventPacket_t structure containing the MIDI event to send\r
                         */\r
-                       void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);\r
+                       void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo, MIDI_EventPacket_t* Event);\r
 \r
                        /** Receives a MIDI event packet from the host.\r
                         *\r
@@ -131,7 +126,7 @@
                         *\r
                         *  \return Boolean true if a MIDI event packet was received, false otherwise\r
                         */\r
-                       bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);\r
+                       bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo, MIDI_EventPacket_t* Event);\r
 \r
        /* Disable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r