projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark build test makefiles as being incompatible with parallel make builds, as they...
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
Class
/
Host
/
MIDIClassHost.c
diff --git
a/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c
b/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c
index
1300577
..
b1abb68
100644
(file)
--- a/
LUFA/Drivers/USB/Class/Host/MIDIClassHost.c
+++ b/
LUFA/Drivers/USB/Class/Host/MIDIClassHost.c
@@
-156,15
+156,21
@@
uint8_t MIDI_Host_Flush(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo)
uint8_t ErrorCode;
Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipe.Address);
uint8_t ErrorCode;
Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipe.Address);
-
+ Pipe_Unfreeze();
+
if (Pipe_BytesInPipe())
{
Pipe_ClearOUT();
if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)
if (Pipe_BytesInPipe())
{
Pipe_ClearOUT();
if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)
- return ErrorCode;
+ {
+ Pipe_Freeze();
+ return ErrorCode;
+ }
}
}
+ Pipe_Freeze();
+
return PIPE_READYWAIT_NoError;
}
return PIPE_READYWAIT_NoError;
}
@@
-177,13
+183,19
@@
uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterface
uint8_t ErrorCode;
Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipe.Address);
uint8_t ErrorCode;
Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipe.Address);
-
+ Pipe_Unfreeze();
+
if ((ErrorCode = Pipe_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NULL)) != PIPE_RWSTREAM_NoError)
if ((ErrorCode = Pipe_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NULL)) != PIPE_RWSTREAM_NoError)
- return ErrorCode;
+ {
+ Pipe_Freeze();
+ return ErrorCode;
+ }
if (!(Pipe_IsReadWriteAllowed()))
Pipe_ClearOUT();
if (!(Pipe_IsReadWriteAllowed()))
Pipe_ClearOUT();
+ Pipe_Freeze();
+
return PIPE_RWSTREAM_NoError;
}
return PIPE_RWSTREAM_NoError;
}