X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/dcf303762ad6b1401d2dcfd763764b400dcee2f7..eff07bb87758a12064d9de9c859b1e6e6502f2ea:/Demos/Device/ClassDriver/MIDI/MIDI.c

diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c
index 511f280d6..fcb86d661 100644
--- a/Demos/Device/ClassDriver/MIDI/MIDI.c
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.c
@@ -40,15 +40,18 @@
  *  passed to all MIDI Class driver functions, so that multiple instances of the same class
  *  within a device can be differentiated from one another.
  */
-USB_ClassInfo_MIDI_t Keyboard_MIDI_Interface =
+USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface =
 	{
-		.StreamingInterfaceNumber = 1,
+		.Config =
+			{
+				.StreamingInterfaceNumber = 1,
 
-		.DataINEndpointNumber     = MIDI_STREAM_IN_EPNUM,
-		.DataINEndpointSize       = MIDI_STREAM_EPSIZE,
+				.DataINEndpointNumber     = MIDI_STREAM_IN_EPNUM,
+				.DataINEndpointSize       = MIDI_STREAM_EPSIZE,
 
-		.DataOUTEndpointNumber    = MIDI_STREAM_OUT_EPNUM,
-		.DataOUTEndpointSize      = MIDI_STREAM_EPSIZE,
+				.DataOUTEndpointNumber    = MIDI_STREAM_OUT_EPNUM,
+				.DataOUTEndpointSize      = MIDI_STREAM_EPSIZE,
+			},
 	};
 
 /** Main program entry point. This routine contains the overall program flow, including initial
@@ -64,7 +67,8 @@ int main(void)
 	{
 		CheckJoystickMovement();
 		
-		USB_MIDI_EventPacket_t DummyMIDIEvent;
+		/* Must acknowedge MIDI packets from the host even though they aren't used, or the host locks up */
+		MIDI_EventPacket_t DummyMIDIEvent;
 		MIDI_Device_ReceiveEventPacket(&Keyboard_MIDI_Interface, &DummyMIDIEvent);
 	
 		MIDI_Device_USBTask(&Keyboard_MIDI_Interface);
@@ -136,7 +140,7 @@ void CheckJoystickMovement(void)
 	
 	if (MIDICommand)
 	{
-		USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)
+		MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t)
 			{
 				.CableNumber = 0,
 				.Command     = (MIDICommand >> 4),