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 0d33bfe..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;
 }
 


@@ -192,18 +204,27 @@ bool MIDI_Host_ReceiveEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterface
 {
        if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive))
          return HOST_SENDCONTROL_DeviceDisconnected;
 {
        if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive))
          return HOST_SENDCONTROL_DeviceDisconnected;

+         
+       bool DataReady = false;

 
        Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataINPipe.Address);
 
        Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataINPipe.Address);

+       Pipe_Unfreeze();

 
 

-       if (!(Pipe_IsReadWriteAllowed()))
-         return false;
-
-       Pipe_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NULL);
-
-       if (!(Pipe_IsReadWriteAllowed()))
-         Pipe_ClearIN();
+       if (Pipe_IsINReceived())
+       {
+               if (Pipe_BytesInPipe())
+               {
+                       Pipe_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NULL);
+                       DataReady = true;
+               }

 
 

-       return true;
+               if (!(Pipe_BytesInPipe()))
+                 Pipe_ClearIN();
+       }
+       
+       Pipe_Freeze();
+       
+       return DataReady;

 }
 
 #endif
 }
 
 #endif