Move new Class Driver powered demos to a new ClassDriver subdirectory, re-add old...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Device / MIDI.c

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
index 9b4cd4b..f96604b 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -30,6 +30,11 @@
 \r
 #include "MIDI.h"\r
 \r
 \r
 #include "MIDI.h"\r
 \r

+void USB_MIDI_ProcessControlPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+{\r
+\r
+}\r
+\r

 bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
 {\r
        if (MIDIInterfaceInfo->DataINEndpointNumber)\r
 bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
 {\r
        if (MIDIInterfaceInfo->DataINEndpointNumber)\r


@@ -55,24 +60,9 @@ bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)
        return true;\r
 }\r
 \r
        return true;\r
 }\r
 \r

-void USB_MIDI_SendNoteChange(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, const uint8_t Pitch, const bool OnOff,\r
-                             const uint8_t CableID, const uint8_t Channel)\r
+void USB_MIDI_USBTask(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r

 {\r
 {\r

-       if (!(USB_IsConnected))\r
-         return;\r
-       \r
-       Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);\r
-       while (!(Endpoint_IsReadWriteAllowed()));\r
-\r
-       uint8_t Command = ((OnOff)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
-\r
-       Endpoint_Write_Byte((CableID << 4) | (Command >> 4));\r

 \r
 \r

-       Endpoint_Write_Byte(Command | Channel);\r
-       Endpoint_Write_Byte(Pitch);\r
-       Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);\r
-       \r
-       Endpoint_ClearIN();\r

 }\r
 \r
 void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
 }\r
 \r
 void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r


@@ -81,10 +71,12 @@ void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_
          return;\r
        \r
        Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);\r
          return;\r
        \r
        Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);\r

-       while (!(Endpoint_IsReadWriteAllowed()));\r

 \r
 \r

-       Endpoint_Write_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
-       Endpoint_ClearIN();\r
+       if (Endpoint_IsReadWriteAllowed());\r
+       {\r
+               Endpoint_Write_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
+               Endpoint_ClearIN();\r
+       }\r

 }\r
 \r
 bool USB_MIDI_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
 }\r
 \r
 bool USB_MIDI_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r