Fix bugs in the Host mode Audio class driver.

[pub/lufa.git] / LUFA / Drivers / USB / Class / Host / Audio.h

diff --git a/LUFA/Drivers/USB/Class/Host/Audio.h b/LUFA/Drivers/USB/Class/Host/Audio.h
index 1cac3e7..26d5376 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/Audio.h
+++ b/LUFA/Drivers/USB/Class/Host/Audio.h
@@ -79,8 +79,14 @@
                        {\r
                                const struct\r
                                {\r
-                                       uint8_t  DataINPipeNumber; /**< Pipe number of the Audio interface's IN data pipe. */\r
-                                       uint8_t  DataOUTPipeNumber; /**< Pipe number of the Audio interface's OUT data pipe. */\r
+                                       uint8_t  DataINPipeNumber; /**< Pipe number of the Audio interface's IN data pipe. If this interface should not\r
+                                                                   *   bind to an IN endpoint, this may be set to 0 to disable audio input streaming for\r
+                                                                   *   this driver instance.\r
+                                                                   */\r
+                                       uint8_t  DataOUTPipeNumber; /**< Pipe number of the Audio interface's OUT data pipe. If this interface should not\r
+                                                                   *   bind to an OUT endpoint, this may be set to 0 to disable audio output streaming for\r
+                                                                   *   this driver instance.\r
+                                                                   */\r
                                } Config; /**< Config data for the USB class interface within the device. All elements in this section\r
                                           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.\r
                                           */\r
@@ -194,10 +200,11 @@
 \r
                                bool SampleReceived = false;\r
 \r
-                               Pipe_SelectPipe(AudioInterfaceInfo->Config.DataOUTPipeNumber);\r
+                               Pipe_SelectPipe(AudioInterfaceInfo->Config.DataINPipeNumber);\r
                                Pipe_Unfreeze();\r
                                SampleReceived = Pipe_IsINReceived();\r
                                Pipe_Freeze();\r
+\r
                                return SampleReceived;\r
                        }\r
 \r
@@ -218,7 +225,7 @@
                                if ((USB_HostState != HOST_STATE_Configured) || !(AudioInterfaceInfo->State.IsActive))\r
                                  return false;\r
 \r
-                               Pipe_SelectPipe(AudioInterfaceInfo->Config.DataINPipeNumber);\r
+                               Pipe_SelectPipe(AudioInterfaceInfo->Config.DataOUTPipeNumber);\r
                                return Pipe_IsOUTReady();\r
                        }\r
 \r
@@ -324,10 +331,11 @@
                        {\r
                                Pipe_Write_8(Sample);\r
 \r
-                               if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataINPipeSize)\r
+                               if (!(Pipe_IsReadWriteAllowed()))\r
                                {\r
                                        Pipe_Unfreeze();\r
                                        Pipe_ClearOUT();\r
+                                       Pipe_WaitUntilReady();\r
                                        Pipe_Freeze();\r
                                }\r
                        }\r
@@ -347,10 +355,11 @@
                        {\r
                                Pipe_Write_16_LE(Sample);\r
 \r
-                               if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataINPipeSize)\r
+                               if (!(Pipe_IsReadWriteAllowed()))\r
                                {\r
                                        Pipe_Unfreeze();\r
                                        Pipe_ClearOUT();\r
+                                       Pipe_WaitUntilReady();\r
                                        Pipe_Freeze();\r
                                }\r
                        }\r
@@ -371,10 +380,11 @@
                                Pipe_Write_16_LE(Sample);\r
                                Pipe_Write_8(Sample >> 16);\r
 \r
-                               if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataINPipeSize)\r
+                               if (!(Pipe_IsReadWriteAllowed()))\r
                                {\r
                                        Pipe_Unfreeze();\r
                                        Pipe_ClearOUT();\r
+                                       Pipe_WaitUntilReady();\r
                                        Pipe_Freeze();\r
                                }\r
                        }\r