From ee495ca5002da26bae51a95d1922474708a2e818 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 3 Nov 2010 03:20:08 +0000 Subject: Fixed MIDI class driver send routines silently discarding packets if the endpoint or pipe is busy (thanks to Robin Green). --- LUFA/Drivers/USB/Class/Device/MIDI.c | 15 ++++++--------- LUFA/Drivers/USB/Class/Host/MIDI.c | 15 ++++++--------- LUFA/ManPages/ChangeLog.txt | 1 + 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c index 2e1757547..78d9043a9 100644 --- a/LUFA/Drivers/USB/Class/Device/MIDI.c +++ b/LUFA/Drivers/USB/Class/Device/MIDI.c @@ -92,18 +92,15 @@ uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInter if (USB_DeviceState != DEVICE_STATE_Configured) return ENDPOINT_RWSTREAM_DeviceDisconnected; + uint8_t ErrorCode; + Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber); - if (Endpoint_IsReadWriteAllowed()) - { - uint8_t ErrorCode; + if ((ErrorCode = Endpoint_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != ENDPOINT_RWSTREAM_NoError) + return ErrorCode; - if ((ErrorCode = Endpoint_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != ENDPOINT_RWSTREAM_NoError) - return ErrorCode; - - if (!(Endpoint_IsReadWriteAllowed())) - Endpoint_ClearIN(); - } + if (!(Endpoint_IsReadWriteAllowed())) + Endpoint_ClearIN(); return ENDPOINT_RWSTREAM_NoError; } diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.c b/LUFA/Drivers/USB/Class/Host/MIDI.c index ad6c5cfd8..87e429010 100644 --- a/LUFA/Drivers/USB/Class/Host/MIDI.c +++ b/LUFA/Drivers/USB/Class/Host/MIDI.c @@ -179,18 +179,15 @@ uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterface if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive)) return HOST_SENDCONTROL_DeviceDisconnected; + uint8_t ErrorCode; + Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipeNumber); - if (Pipe_IsReadWriteAllowed()) - { - uint8_t ErrorCode; + if ((ErrorCode = Pipe_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError) + return ErrorCode; - if ((ErrorCode = Pipe_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError) - return ErrorCode; - - if (!(Pipe_IsReadWriteAllowed())) - Pipe_ClearOUT(); - } + if (!(Pipe_IsReadWriteAllowed())) + Pipe_ClearOUT(); return PIPE_RWSTREAM_NoError; } diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index 19c6fd6c4..69b129de5 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -92,6 +92,7 @@ * - Fixed ISR definition conflict in the XPLAIN bridge between the software UART and the AVRISP-MKII ISP modules * - Fixed random enumeration failure while in device mode due to interrupts causing the Set Address request to exceed maximum timings * - Fixed MIDI_Host_Flush() not aborting early when the specified MIDI host interface was not configured + * - Fixed MIDI class driver send routines silently discarding packets if the endpoint or pipe is busy (thanks to Robin Green) * * \section Sec_ChangeLog100807 Version 100807 * New: -- cgit v1.2.3