X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/b9b03aadb219d06fbad9d110e508db93e45461af..d0db78432fc02bacbd57cc9f15eb05b4e56981cb:/Demos/Device/ClassDriver/MIDI/MIDI.c

diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c
index 8881d1dc7..a6c31ee47 100644
--- a/Demos/Device/ClassDriver/MIDI/MIDI.c
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.c
@@ -40,15 +40,23 @@
  *  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,
+			},
+			
+		.State =
+			{
+				// Leave all state values to their defaults			
+			}
 	};
 
 /** Main program entry point. This routine contains the overall program flow, including initial
@@ -63,8 +71,11 @@ int main(void)
 	for (;;)
 	{
 		CheckJoystickMovement();
+		
+		MIDI_EventPacket_t DummyMIDIEvent;
+		MIDI_Device_ReceiveEventPacket(&Keyboard_MIDI_Interface, &DummyMIDIEvent);
 	
-		USB_MIDI_USBTask(&Keyboard_MIDI_Interface);
+		MIDI_Device_USBTask(&Keyboard_MIDI_Interface);
 		USB_USBTask();
 	}
 }
@@ -133,17 +144,17 @@ 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,
+				.Command     = (MIDICommand >> 4),
 				
-				.Data1       = (MIDICommand << 4) | Channel,
+				.Data1       = MIDICommand | Channel,
 				.Data2       = MIDIPitch,
 				.Data3       = MIDI_STANDARD_VELOCITY,			
 			};
 			
-		USB_MIDI_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);
+		MIDI_Device_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);
 	}
 
 	PrevJoystickStatus = JoystickStatus;
@@ -166,12 +177,12 @@ void EVENT_USB_ConfigurationChanged(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
 	
-	if (!(USB_MIDI_ConfigureEndpoints(&Keyboard_MIDI_Interface)))
+	if (!(MIDI_Device_ConfigureEndpoints(&Keyboard_MIDI_Interface)))
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
 
 /** Event handler for the library USB Unhandled Control Packet event. */
 void EVENT_USB_UnhandledControlPacket(void)
 {
-	USB_MIDI_ProcessControlPacket(&Keyboard_MIDI_Interface);
+	MIDI_Device_ProcessControlPacket(&Keyboard_MIDI_Interface);
 }