Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and...

[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..60119d2 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -33,28 +33,30 @@
 \r
 #include "MIDI.h"\r
 \r
-void MIDI_Device_ProcessControlPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+void MIDI_Device_ProcessControlRequest(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)\r
 {\r
 \r
 }\r
 \r
-bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)\r
 {\r
-       if (MIDIInterfaceInfo->DataINEndpointNumber)\r
+       memset(&MIDIInterfaceInfo->State, 0x00, sizeof(MIDIInterfaceInfo->State));\r
+\r
+       if (MIDIInterfaceInfo->Config.DataINEndpointNumber)\r
        {\r
-               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataINEndpointNumber, EP_TYPE_BULK,\r
-                                                                                ENDPOINT_DIR_IN, MIDIInterfaceInfo->DataINEndpointSize,\r
-                                                                                ENDPOINT_BANK_SINGLE)))\r
+               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_BULK,\r
+                                                                                ENDPOINT_DIR_IN, MIDIInterfaceInfo->Config.DataINEndpointSize,\r
+                                                                                MIDIInterfaceInfo->Config.DataINEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))\r
                {\r
                        return false;\r
                }\r
        }\r
 \r
-       if (MIDIInterfaceInfo->DataOUTEndpointNumber)\r
+       if (MIDIInterfaceInfo->Config.DataOUTEndpointNumber)\r
        {\r
-               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataOUTEndpointNumber, EP_TYPE_BULK,\r
-                                                                                ENDPOINT_DIR_OUT, MIDIInterfaceInfo->DataOUTEndpointSize,\r
-                                                                                ENDPOINT_BANK_SINGLE)))\r
+               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpointNumber, EP_TYPE_BULK,\r
+                                                                                ENDPOINT_DIR_OUT, MIDIInterfaceInfo->Config.DataOUTEndpointSize,\r
+                                                                                MIDIInterfaceInfo->Config.DataOUTEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))\r
                {\r
                        return false;\r
                }\r
@@ -63,36 +65,42 @@ bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)
        return true;\r
 }\r
 \r
-void MIDI_Device_USBTask(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)\r
 {\r
-\r
+       (void)MIDIInterfaceInfo;\r
 }\r
 \r
-void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
+uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r
 {\r
-       if (!(USB_IsConnected))\r
-         return;\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+         return ENDPOINT_RWSTREAM_DeviceDisconnected;\r
        \r
-       Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);\r
+       Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber);\r
 \r
        if (Endpoint_IsReadWriteAllowed());\r
        {\r
-               Endpoint_Write_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
+               uint8_t ErrorCode;\r
+\r
+               if ((ErrorCode = Endpoint_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != ENDPOINT_RWSTREAM_NoError)\r
+                 return ErrorCode;\r
+\r
                Endpoint_ClearIN();\r
        }\r
+       \r
+       return ENDPOINT_RWSTREAM_NoError;\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* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r
 {\r
-       if (!(USB_IsConnected))\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\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
-       Endpoint_Read_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
+       Endpoint_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
        Endpoint_ClearOUT();\r
        \r
        return true;\r