X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/b37d77eab32d171ad7b28157a924a4026e2aebd1..e39f3378a21ae5076e8c49bc728c20e436e3a69f:/Demos/Device/LowLevel/MIDI/MIDI.c

diff --git a/Demos/Device/LowLevel/MIDI/MIDI.c b/Demos/Device/LowLevel/MIDI/MIDI.c
index 05a3a71fc..f8bc4e917 100644
--- a/Demos/Device/LowLevel/MIDI/MIDI.c
+++ b/Demos/Device/LowLevel/MIDI/MIDI.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2012.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -94,10 +94,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 	bool ConfigSuccess = true;
 
 	/* Setup MIDI Data Endpoints */
-	ConfigSuccess &= Endpoint_ConfigureEndpoint(MIDI_STREAM_IN_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_IN,
-	                                            MIDI_STREAM_EPSIZE, ENDPOINT_BANK_SINGLE);
-	ConfigSuccess &= Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_OUT,
-	                                            MIDI_STREAM_EPSIZE, ENDPOINT_BANK_SINGLE);
+	ConfigSuccess &= Endpoint_ConfigureEndpoint(MIDI_STREAM_IN_EPADDR, EP_TYPE_BULK, MIDI_STREAM_EPSIZE, 1);
+	ConfigSuccess &= Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPADDR, EP_TYPE_BULK, MIDI_STREAM_EPSIZE, 1);
 
 	/* Indicate endpoint configuration success or failure */
 	LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
@@ -114,7 +112,7 @@ void MIDI_Task(void)
 	if (USB_DeviceState != DEVICE_STATE_Configured)
 	  return;
 
-	Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);
+	Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPADDR);
 
 	if (Endpoint_IsINReady())
 	{
@@ -171,7 +169,7 @@ void MIDI_Task(void)
 				};
 
 			/* Write the MIDI event packet to the endpoint */
-			Endpoint_Write_Stream_LE(&MIDIEvent, sizeof(MIDIEvent));
+			Endpoint_Write_Stream_LE(&MIDIEvent, sizeof(MIDIEvent), NULL);
 
 			/* Send the data in the endpoint to the host */
 			Endpoint_ClearIN();
@@ -182,7 +180,7 @@ void MIDI_Task(void)
 	}
 
 	/* Select the MIDI OUT stream */
-	Endpoint_SelectEndpoint(MIDI_STREAM_OUT_EPNUM);
+	Endpoint_SelectEndpoint(MIDI_STREAM_OUT_EPADDR);
 
 	/* Check if a MIDI command has been received */
 	if (Endpoint_IsOUTReceived())
@@ -190,7 +188,7 @@ void MIDI_Task(void)
 		MIDI_EventPacket_t MIDIEvent;
 
 		/* Read the MIDI event packet from the endpoint */
-		Endpoint_Read_Stream_LE(&MIDIEvent, sizeof(MIDIEvent));
+		Endpoint_Read_Stream_LE(&MIDIEvent, sizeof(MIDIEvent), NULL);
 
 		/* Check to see if the sent command is a note on message with a non-zero velocity */
 		if ((MIDIEvent.Command == (MIDI_COMMAND_NOTE_ON >> 4)) && (MIDIEvent.Data3 > 0))
@@ -204,8 +202,12 @@ void MIDI_Task(void)
 			LEDs_SetAllLEDs(LEDS_NO_LEDS);
 		}
 
-		/* Clear the endpoint ready for new packet */
-		Endpoint_ClearOUT();
+		/* If the endpoint is now empty, clear the bank */
+		if (!(Endpoint_BytesInEndpoint()))
+		{
+			/* Clear the endpoint ready for new packet */
+			Endpoint_ClearOUT();
+		}
 	}
 }