Break device mode class driver interfaces into seperate config and state structs...

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

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
index a2ab0be..1d342f5 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -33,27 +33,27 @@
 \r
 #include "MIDI.h"\r
 \r
 \r
 #include "MIDI.h"\r
 \r

-void MIDI_Device_ProcessControlPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+void MIDI_Device_ProcessControlPacket(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo)\r

 {\r
 \r
 }\r
 \r
 {\r
 \r
 }\r
 \r

-bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo)\r

 {\r
 {\r

-       if (MIDIInterfaceInfo->DataINEndpointNumber)\r
+       if (MIDIInterfaceInfo->Config.DataINEndpointNumber)\r

        {\r
        {\r

-               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataINEndpointNumber, EP_TYPE_BULK,\r
-                                                                                ENDPOINT_DIR_IN, MIDIInterfaceInfo->DataINEndpointSize,\r
+               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_BULK,\r
+                                                                                ENDPOINT_DIR_IN, MIDIInterfaceInfo->Config.DataINEndpointSize,\r

                                                                                 ENDPOINT_BANK_SINGLE)))\r
                {\r
                        return false;\r
                }\r
        }\r
 \r
                                                                                 ENDPOINT_BANK_SINGLE)))\r
                {\r
                        return false;\r
                }\r
        }\r
 \r

-       if (MIDIInterfaceInfo->DataOUTEndpointNumber)\r
+       if (MIDIInterfaceInfo->Config.DataOUTEndpointNumber)\r

        {\r
        {\r

-               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataOUTEndpointNumber, EP_TYPE_BULK,\r
-                                                                                ENDPOINT_DIR_OUT, MIDIInterfaceInfo->DataOUTEndpointSize,\r
+               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpointNumber, EP_TYPE_BULK,\r
+                                                                                ENDPOINT_DIR_OUT, MIDIInterfaceInfo->Config.DataOUTEndpointSize,\r

                                                                                 ENDPOINT_BANK_SINGLE)))\r
                {\r
                        return false;\r
                                                                                 ENDPOINT_BANK_SINGLE)))\r
                {\r
                        return false;\r


@@ -63,17 +63,17 @@ bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)
        return true;\r
 }\r
 \r
        return true;\r
 }\r
 \r

-void MIDI_Device_USBTask(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo)\r

 {\r
 \r
 }\r
 \r
 {\r
 \r
 }\r
 \r

-void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
+void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r

 {\r
        if (!(USB_IsConnected))\r
          return;\r
        \r
 {\r
        if (!(USB_IsConnected))\r
          return;\r
        \r

-       Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);\r
+       Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber);\r

 \r
        if (Endpoint_IsReadWriteAllowed());\r
        {\r
 \r
        if (Endpoint_IsReadWriteAllowed());\r
        {\r


@@ -82,12 +82,12 @@ void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MI
        }\r
 }\r
 \r
        }\r
 }\r
 \r

-bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
+bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r

 {\r
        if (!(USB_IsConnected))\r
          return false;\r
        \r
 {\r
        if (!(USB_IsConnected))\r
          return false;\r
        \r

-       Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataOUTEndpointNumber);\r
+       Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpointNumber);\r

 \r
        if (!(Endpoint_IsReadWriteAllowed()))\r
          return false;\r
 \r
        if (!(Endpoint_IsReadWriteAllowed()))\r
          return false;\r