Add FatFS library to the Webserver project, extend the HTTP server so that it now...

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

diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.c b/LUFA/Drivers/USB/Class/Host/MIDI.c
index 69118cd..a5ad4bf 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Host/MIDI.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\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
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\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
@@ -35,7 +35,7 @@
 #include "MIDI.h"\r
 \r
 uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo, uint16_t ConfigDescriptorSize,\r
-                                 uint8_t* ConfigDescriptorData)\r
+                                 void* ConfigDescriptorData)\r
 {\r
        uint8_t FoundEndpoints = 0;\r
 \r
@@ -63,7 +63,8 @@ uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceI
                if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)\r
                {\r
                        Pipe_ConfigurePipe(MIDIInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_IN,\r
-                                                          EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+                                                          EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
+                                                          MIDIInterfaceInfo->Config.DataINPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
                        MIDIInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
                        \r
                        FoundEndpoints |= MIDI_FOUND_DATAPIPE_IN;\r
@@ -71,7 +72,8 @@ uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceI
                else\r
                {\r
                        Pipe_ConfigurePipe(MIDIInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
-                                                          EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+                                                          EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
+                                                          MIDIInterfaceInfo->Config.DataOUTPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
                        MIDIInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
 \r
                        FoundEndpoints |= MIDI_FOUND_DATAPIPE_OUT;\r
@@ -120,26 +122,42 @@ static uint8_t DComp_MIDI_Host_NextMIDIStreamingDataEndpoint(void* const Current
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
-void MIDI_Host_USBTask(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo)\r
+uint8_t MIDI_Host_Flush(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo)\r
 {\r
+       if (USB_HostState != HOST_STATE_Configured)\r
+         return PIPE_RWSTREAM_DeviceDisconnected;\r
+       \r
+       uint8_t ErrorCode;\r
+\r
+       Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipeNumber);\r
+\r
+       if (Pipe_BytesInPipe())\r
+       {\r
+               Pipe_ClearOUT();\r
 \r
+               if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)\r
+                 return ErrorCode;\r
+       }\r
+\r
+       return PIPE_READYWAIT_NoError;\r
 }\r
 \r
 uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
        \r
        Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipeNumber);\r
 \r
-       if (Pipe_IsReadWriteAllowed());\r
+       if (Pipe_IsReadWriteAllowed())\r
        {\r
                uint8_t ErrorCode;\r
 \r
                if ((ErrorCode = Pipe_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
                  return ErrorCode;\r
 \r
-               Pipe_ClearOUT();\r
+               if (!(Pipe_IsReadWriteAllowed()))\r
+                 Pipe_ClearOUT();\r
        }\r
        \r
        return PIPE_RWSTREAM_NoError;\r
@@ -148,7 +166,7 @@ uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterface
 bool MIDI_Host_ReceiveEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
        \r
        Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataINPipeNumber);\r
 \r
@@ -156,7 +174,9 @@ bool MIDI_Host_ReceiveEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterface
          return false;\r
 \r
        Pipe_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
-       Pipe_ClearIN();\r
+\r
+       if (!(Pipe_IsReadWriteAllowed()))\r
+         Pipe_ClearIN();\r
        \r
        return true;\r
 }\r