Added return values to the CDC and MIDI class driver transmit functions.

[pub/USBasp.git] / Demos / Device / ClassDriver / MIDI / MIDI.c

diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c
index bb4eaf2..f1a0d9a 100644 (file)
--- 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\r
  *  within a device can be differentiated from one another.\r
  */\r
  *  passed to all MIDI Class driver functions, so that multiple instances of the same class\r
  *  within a device can be differentiated from one another.\r
  */\r

-USB_ClassInfo_MIDI_t Keyboard_MIDI_Interface =\r
+USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface =\r

        {\r
        {\r

-               .StreamingInterfaceNumber = 1,\r
+               .Config =\r
+                       {\r
+                               .StreamingInterfaceNumber = 1,\r

 \r
 \r

-               .DataINEndpointNumber     = MIDI_STREAM_IN_EPNUM,\r
-               .DataINEndpointSize       = MIDI_STREAM_EPSIZE,\r
+                               .DataINEndpointNumber     = MIDI_STREAM_IN_EPNUM,\r
+                               .DataINEndpointSize       = MIDI_STREAM_EPSIZE,\r

 \r
 \r

-               .DataOUTEndpointNumber    = MIDI_STREAM_OUT_EPNUM,\r
-               .DataOUTEndpointSize      = MIDI_STREAM_EPSIZE,\r
+                               .DataOUTEndpointNumber    = MIDI_STREAM_OUT_EPNUM,\r
+                               .DataOUTEndpointSize      = MIDI_STREAM_EPSIZE,\r
+                       },\r

        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r


@@ -64,10 +67,11 @@ int main(void)
        {\r
                CheckJoystickMovement();\r
                \r
        {\r
                CheckJoystickMovement();\r
                \r

-               USB_MIDI_EventPacket_t DummyMIDIEvent;\r
-               USB_MIDI_ReceiveEventPacket(&Keyboard_MIDI_Interface, &DummyMIDIEvent);\r
+               /* Must acknowedge MIDI packets from the host even though they aren't used, or the host locks up */\r
+               MIDI_EventPacket_t DummyMIDIEvent;\r
+               MIDI_Device_ReceiveEventPacket(&Keyboard_MIDI_Interface, &DummyMIDIEvent);\r

        \r
        \r

-               USB_MIDI_USBTask(&Keyboard_MIDI_Interface);\r
+               MIDI_Device_USBTask(&Keyboard_MIDI_Interface);\r

                USB_USBTask();\r
        }\r
 }\r
                USB_USBTask();\r
        }\r
 }\r


@@ -136,45 +140,45 @@ void CheckJoystickMovement(void)
        \r
        if (MIDICommand)\r
        {\r
        \r
        if (MIDICommand)\r
        {\r

-               USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)\r
+               MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t)\r

                        {\r
                                .CableNumber = 0,\r
                        {\r
                                .CableNumber = 0,\r

-                               .Command     = MIDICommand,\r
+                               .Command     = (MIDICommand >> 4),\r

                                \r
                                \r

-                               .Data1       = (MIDICommand << 4) | Channel,\r
+                               .Data1       = MIDICommand | Channel,\r

                                .Data2       = MIDIPitch,\r
                                .Data3       = MIDI_STANDARD_VELOCITY,                  \r
                        };\r
                        \r
                                .Data2       = MIDIPitch,\r
                                .Data3       = MIDI_STANDARD_VELOCITY,                  \r
                        };\r
                        \r

-               USB_MIDI_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);\r
+               MIDI_Device_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);\r

        }\r
 \r
        PrevJoystickStatus = JoystickStatus;\r
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r
        }\r
 \r
        PrevJoystickStatus = JoystickStatus;\r
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r

-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r

-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r

-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
        \r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
        \r

-       if (!(USB_MIDI_ConfigureEndpoints(&Keyboard_MIDI_Interface)))\r
+       if (!(MIDI_Device_ConfigureEndpoints(&Keyboard_MIDI_Interface)))\r

          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r

-/** Event handler for the library USB Unhandled Control Packet event. */\r
-void EVENT_USB_UnhandledControlPacket(void)\r
+/** Event handler for the library USB Unhandled Control Request event. */\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r

 {\r
 {\r

-       USB_MIDI_ProcessControlPacket(&Keyboard_MIDI_Interface);\r
+       MIDI_Device_ProcessControlRequest(&Keyboard_MIDI_Interface);\r

 }\r
 }\r