diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-11-05 22:16:15 +0100 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-11-05 22:16:15 +0100 |
| commit | 6eba84bf4bd23978068f4aef2ba53447dd8a98db (patch) | |
| tree | 4de9a8a7a2398e9ffe9df6b20191b7d26a0ed178 /LUFA | |
| parent | 16c4f1d43c3c013fe2572025db1d789100c97821 (diff) | |
| download | lufa-6eba84bf4bd23978068f4aef2ba53447dd8a98db.tar.gz lufa-6eba84bf4bd23978068f4aef2ba53447dd8a98db.tar.bz2 lufa-6eba84bf4bd23978068f4aef2ba53447dd8a98db.zip | |
Fixed MIDI device class driver MIDI_Device_ReceiveEventPacket() for the XMEGA architecture.
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/DoxygenPages/ChangeLog.txt | 9 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index 70cf6cb66..7bd8b2997 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -10,16 +10,21 @@ * <b>New:</b> * - Library Applications: * - Added new Bulk Vendor low level device demo + * - Added new libUSB host Python and NodeJS application examples for the class driver GenericHID demo (thanks to Laszlo Monda) * * <b>Changed:</b> * - Library Applications: * - Refactored out USB interface IDs in the demo applications into enums (thanks to Laszlo Monda) * - AVRISP-MKII Clone Project PDI/TPI frequency increased from 250KHz to 2MHz as it is now stable - * - Fixed incorrect signature bytes returned in the DFU bootloader - * - Added new libUSB host Python and NodeJS application examples for the class driver GenericHID demo (thanks to Laszlo Monda) * - Increased TPI/PDI handshake delay to 1ms from 1us to support targets with high amounts of capacitance on their * /RESET lines (thanks to Paul Duke) * + * <b>Fixed:</b> + * - Core: + * - Fixed MIDI device class driver MIDI_Device_ReceiveEventPacket() for the XMEGA architecture + * - Library Applications: + * - Fixed incorrect signature bytes returned in the DFU bootloader + * * \section Sec_ChangeLog130901 Version 130901 * <b>New:</b> * - Core: diff --git a/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c index c782119e9..34f33cfdc 100644 --- a/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c +++ b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c @@ -60,7 +60,7 @@ void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) #if !defined(NO_CLASS_DRIVER_AUTOFLUSH) Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpoint.Address); - + if (Endpoint_IsINReady()) MIDI_Device_Flush(MIDIInterfaceInfo); #endif @@ -113,6 +113,9 @@ bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInter Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpoint.Address); + if (!(Endpoint_IsOUTReceived())) + return false; + if (!(Endpoint_IsReadWriteAllowed())) return false; |