aboutsummaryrefslogtreecommitdiff
path: root/LUFA/Drivers/USB/Class/Device/MIDI.c
diff options
context:
space:
mode:
authorDean Camera <[email protected]>2010-01-05 13:52:34 +0000
committerDean Camera <[email protected]>2010-01-05 13:52:34 +0000
commitd97db1120b2b5911a3ea7d77efb9b913b8727bdb (patch)
treec51e1ddfab5f8c53f95db8016e0eaefc2cf9c36d /LUFA/Drivers/USB/Class/Device/MIDI.c
parent60e96412220b62a614348c287354c56f282fcc70 (diff)
downloadqmk_firmware-d97db1120b2b5911a3ea7d77efb9b913b8727bdb.tar.gz
qmk_firmware-d97db1120b2b5911a3ea7d77efb9b913b8727bdb.zip
Added support to the MIDI Class drivers for packed data, where multiple MIDI events are packed into a single USB packet. Added new MIDI Class driver flush routines to override packing behaviour.
Diffstat (limited to 'LUFA/Drivers/USB/Class/Device/MIDI.c')
-rw-r--r--LUFA/Drivers/USB/Class/Device/MIDI.c27
1 files changed, 25 insertions, 2 deletions
diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
index bc191d77a6..b72c2b0276 100644
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -79,12 +79,33 @@ uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInter
if ((ErrorCode = Endpoint_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != ENDPOINT_RWSTREAM_NoError)
return ErrorCode;
- Endpoint_ClearIN();
+ if (!(Endpoint_IsReadWriteAllowed()))
+ Endpoint_ClearIN();
}
return ENDPOINT_RWSTREAM_NoError;
}
+uint8_t MIDI_Device_Flush(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)
+{
+ if (USB_DeviceState != DEVICE_STATE_Configured)
+ return ENDPOINT_RWSTREAM_DeviceDisconnected;
+
+ uint8_t ErrorCode;
+
+ Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber);
+
+ if (Endpoint_BytesInEndpoint())
+ {
+ Endpoint_ClearIN();
+
+ if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)
+ return ErrorCode;
+ }
+
+ return ENDPOINT_READYWAIT_NoError;
+}
+
bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)
{
if (USB_DeviceState != DEVICE_STATE_Configured)
@@ -96,7 +117,9 @@ bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInter
return false;
Endpoint_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);
- Endpoint_ClearOUT();
+
+ if (!(Endpoint_IsReadWriteAllowed()))
+ Endpoint_ClearOUT();
return true;
}