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.

3 files changed, 43 insertions, 5 deletions

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDC.h
index 20ee3209e..dbc1f9e42 100644
--- a/LUFA/Drivers/USB/Class/Host/CDC.h
+++ b/LUFA/Drivers/USB/Class/Host/CDC.h
@@ -175,7 +175,9 @@
 			uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);

 			

 			/** Sends a given string to the attached USB device, if connected. If a device is not connected when the function is called, the

-			 *  string is discarded.

+			 *  string is discarded. Bytes will be queued for transmission to the device until either the pipe bank becomes full, or the

+			 *  \ref CDC_Host_Flush() function is called to flush the pending data to the host. This allows for multiple bytes to be 

+			 *  packed into a single pipe packet, increasing data throughput.

 			 *

 			 *  \note This function must only be called when the Host state machine is in the HOST_STATE_Configured state or the

 			 *        call will fail.

@@ -189,8 +191,10 @@
 			uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo, char* Data, const uint16_t Length)

 			                            ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);

 			

-			/** Sends a given byte to the attached USB device, if connected. If a host is not connected when the function is called, the

-			 *  byte is discarded.

+			/** Sends a given byte to the attached USB device, if connected. If a device is not connected when the function is called, the

+			 *  byte is discarded. Bytes will be queued for transmission to the device until either the pipe bank becomes full, or the

+			 *  \ref CDC_Host_Flush() function is called to flush the pending data to the host. This allows for multiple bytes to be 

+			 *  packed into a single pipe packet, increasing data throughput.

 			 *

 			 *  \note This function must only be called when the Host state machine is in the HOST_STATE_Configured state or the

 			 *        call will fail.

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;

 }

diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.h b/LUFA/Drivers/USB/Class/Host/MIDI.h
index b1971b16d..7b1cba395 100644
--- a/LUFA/Drivers/USB/Class/Host/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Host/MIDI.h
@@ -125,6 +125,17 @@
 			uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,

 			                                  MIDI_EventPacket_t* const Event) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);

 

+			/** Flushes the MIDI send buffer, sending any queued MIDI events to the device. This should be called to override the

+			 *  \ref MIDI_Host_SendEventPacket() function's packing behaviour, to flush queued events. Events are queued into the

+			 *  pipe bank until either the pipe bank is full, or \ref MIDI_Host_Flush() is called. This allows for multiple MIDI

+			 *  events to be packed into a single pipe packet, increasing data throughput.

+			 *

+			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state

+			 *

+			 *  \return A value from the \ref Pipe_WaitUntilReady_ErrorCodes_t enum

+			 */

+			 uint8_t MIDI_Host_Flush(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo);

+			 

 			/** Receives a MIDI event packet from the device.

 			 *

 			 *  \note This function must only be called when the Host state machine is in the HOST_STATE_Configured state or the