diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-01-05 13:52:34 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-01-05 13:52:34 +0000 |
| commit | d97db1120b2b5911a3ea7d77efb9b913b8727bdb (patch) | |
| tree | c51e1ddfab5f8c53f95db8016e0eaefc2cf9c36d /LUFA/Drivers/USB/Class/Host/MIDI.c | |
| parent | 60e96412220b62a614348c287354c56f282fcc70 (diff) | |
| download | lufa-d97db1120b2b5911a3ea7d77efb9b913b8727bdb.tar.gz lufa-d97db1120b2b5911a3ea7d77efb9b913b8727bdb.tar.bz2 lufa-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/Host/MIDI.c')
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/MIDI.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.c b/LUFA/Drivers/USB/Class/Host/MIDI.c index 3cb0df6fb..a5ad4bf2b 100644 --- a/LUFA/Drivers/USB/Class/Host/MIDI.c +++ b/LUFA/Drivers/USB/Class/Host/MIDI.c @@ -122,6 +122,26 @@ static uint8_t DComp_MIDI_Host_NextMIDIStreamingDataEndpoint(void* const Current return DESCRIPTOR_SEARCH_NotFound;
}
+uint8_t MIDI_Host_Flush(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo)
+{
+ if (USB_HostState != HOST_STATE_Configured)
+ return PIPE_RWSTREAM_DeviceDisconnected;
+
+ uint8_t ErrorCode;
+
+ Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipeNumber);
+
+ if (Pipe_BytesInPipe())
+ {
+ Pipe_ClearOUT();
+
+ if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)
+ return ErrorCode;
+ }
+
+ return PIPE_READYWAIT_NoError;
+}
+
uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)
{
if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive))
@@ -136,7 +156,8 @@ uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterface if ((ErrorCode = Pipe_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)
return ErrorCode;
- Pipe_ClearOUT();
+ if (!(Pipe_IsReadWriteAllowed()))
+ Pipe_ClearOUT();
}
return PIPE_RWSTREAM_NoError;
@@ -153,7 +174,9 @@ bool MIDI_Host_ReceiveEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterface return false;
Pipe_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);
- Pipe_ClearIN();
+
+ if (!(Pipe_IsReadWriteAllowed()))
+ Pipe_ClearIN();
return true;
}
|