Oops - fix include directory for case-sensitive filesystems.

[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 42c0690..3cebc24 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -9,13 +9,13 @@
 /*\r
   Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
 /*\r
   Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r

-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -28,25 +28,35 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r

 #include "MIDI.h"\r
 \r
 #include "MIDI.h"\r
 \r

-bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+void MIDI_Device_ProcessControlRequest(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)\r

 {\r
 {\r

-       if (MIDIInterfaceInfo->DataINEndpointNumber)\r
+\r
+}\r
+\r
+bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)\r
+{\r
+       memset(&MIDIInterfaceInfo->State, 0x00, sizeof(MIDIInterfaceInfo->State));\r
+\r
+       if (MIDIInterfaceInfo->Config.DataINEndpointNumber)\r

        {\r
        {\r

-               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataINEndpointNumber, EP_TYPE_BULK,\r
-                                                                                ENDPOINT_DIR_IN, MIDIInterfaceInfo->DataINEndpointSize,\r
-                                                                                ENDPOINT_BANK_SINGLE)))\r
+               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_BULK,\r
+                                                                                ENDPOINT_DIR_IN, MIDIInterfaceInfo->Config.DataINEndpointSize,\r
+                                                                                MIDIInterfaceInfo->Config.DataINEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))\r

                {\r
                        return false;\r
                }\r
        }\r
 \r
                {\r
                        return false;\r
                }\r
        }\r
 \r

-       if (MIDIInterfaceInfo->DataOUTEndpointNumber)\r
+       if (MIDIInterfaceInfo->Config.DataOUTEndpointNumber)\r

        {\r
        {\r

-               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataOUTEndpointNumber, EP_TYPE_BULK,\r
-                                                                                ENDPOINT_DIR_OUT, MIDIInterfaceInfo->DataOUTEndpointSize,\r
-                                                                                ENDPOINT_BANK_SINGLE)))\r
+               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpointNumber, EP_TYPE_BULK,\r
+                                                                                ENDPOINT_DIR_OUT, MIDIInterfaceInfo->Config.DataOUTEndpointSize,\r
+                                                                                MIDIInterfaceInfo->Config.DataOUTEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))\r

                {\r
                        return false;\r
                }\r
                {\r
                        return false;\r
                }\r


@@ -55,32 +65,45 @@ bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)
        return true;\r
 }\r
 \r
        return true;\r
 }\r
 \r

-void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
+void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)\r

 {\r
 {\r

-       if (!(USB_IsConnected))\r
-         return;\r
+       (void)MIDIInterfaceInfo;\r
+}\r
+\r
+uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r
+{\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+         return ENDPOINT_RWSTREAM_DeviceDisconnected;\r

        \r
        \r

-       Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);\r
+       Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber);\r

 \r
        if (Endpoint_IsReadWriteAllowed());\r
        {\r
 \r
        if (Endpoint_IsReadWriteAllowed());\r
        {\r

-               Endpoint_Write_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
+               uint8_t ErrorCode;\r
+\r
+               if ((ErrorCode = Endpoint_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != ENDPOINT_RWSTREAM_NoError)\r
+                 return ErrorCode;\r
+\r

                Endpoint_ClearIN();\r
        }\r
                Endpoint_ClearIN();\r
        }\r

+       \r
+       return ENDPOINT_RWSTREAM_NoError;\r

 }\r
 \r
 }\r
 \r

-bool USB_MIDI_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
+bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r

 {\r
 {\r

-       if (!(USB_IsConnected))\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r

          return false;\r
        \r
          return false;\r
        \r

-       Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataOUTEndpointNumber);\r
+       Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpointNumber);\r

 \r
        if (!(Endpoint_IsReadWriteAllowed()))\r
          return false;\r
 \r
 \r
        if (!(Endpoint_IsReadWriteAllowed()))\r
          return false;\r
 \r

-       Endpoint_Read_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
+       Endpoint_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r

        Endpoint_ClearOUT();\r
        \r
        return true;\r
 }\r
        Endpoint_ClearOUT();\r
        \r
        return true;\r
 }\r

+\r
+#endif\r