Fix errors in the library Host mode Audio Class driver.

diff --git a/LUFA/Drivers/USB/Class/Host/Audio.c b/LUFA/Drivers/USB/Class/Host/Audio.c
index 80ab2d1..e02ce30 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/Audio.c
+++ b/LUFA/Drivers/USB/Class/Host/Audio.c
@@ -213,11 +213,11 @@ uint8_t Audio_GetSetEndpointProperty(USB_ClassInfo_Audio_Host_t* const AudioInte
 {\r
        uint8_t RequestType;\r
        uint8_t EndpointAddress;\r
 {\r
        uint8_t RequestType;\r
        uint8_t EndpointAddress;\r

-       \r
+\r

        if (EndpointProperty & 0x80)\r
        if (EndpointProperty & 0x80)\r

-         RequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE);\r
+         RequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT);\r

        else\r
        else\r

-         RequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE);       \r
+         RequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_ENDPOINT);\r

          \r
        Pipe_SelectPipe(DataPipeIndex);\r
        EndpointAddress = Pipe_GetBoundEndpointAddress();\r
          \r
        Pipe_SelectPipe(DataPipeIndex);\r
        EndpointAddress = Pipe_GetBoundEndpointAddress();\r


@@ -233,7 +233,7 @@ uint8_t Audio_GetSetEndpointProperty(USB_ClassInfo_Audio_Host_t* const AudioInte
 \r
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
 \r
 \r
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
 \r

-       return USB_Host_SendControlRequest(Data);       \r
+       return USB_Host_SendControlRequest(Data);\r

 }\r
 \r
 #endif\r
 }\r
 \r
 #endif\r

diff --git a/LUFA/Drivers/USB/Class/Host/Audio.h b/LUFA/Drivers/USB/Class/Host/Audio.h
index 1cac3e7..befcc2f 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/Audio.h
+++ b/LUFA/Drivers/USB/Class/Host/Audio.h
@@ -194,10 +194,11 @@
 \r
                                bool SampleReceived = false;\r
 \r
 \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
                                Pipe_Unfreeze();\r
                                SampleReceived = Pipe_IsINReceived();\r
                                Pipe_Freeze();\r

+\r

                                return SampleReceived;\r
                        }\r
 \r
                                return SampleReceived;\r
                        }\r
 \r


@@ -218,7 +219,7 @@
                                if ((USB_HostState != HOST_STATE_Configured) || !(AudioInterfaceInfo->State.IsActive))\r
                                  return false;\r
 \r
                                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
                                return Pipe_IsOUTReady();\r
                        }\r
 \r


@@ -324,7 +325,7 @@
                        {\r
                                Pipe_Write_8(Sample);\r
 \r
                        {\r
                                Pipe_Write_8(Sample);\r
 \r

-                               if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataINPipeSize)\r
+                               if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataOUTPipeSize)\r

                                {\r
                                        Pipe_Unfreeze();\r
                                        Pipe_ClearOUT();\r
                                {\r
                                        Pipe_Unfreeze();\r
                                        Pipe_ClearOUT();\r


@@ -347,7 +348,7 @@
                        {\r
                                Pipe_Write_16_LE(Sample);\r
 \r
                        {\r
                                Pipe_Write_16_LE(Sample);\r
 \r

-                               if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataINPipeSize)\r
+                               if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataOUTPipeSize)\r

                                {\r
                                        Pipe_Unfreeze();\r
                                        Pipe_ClearOUT();\r
                                {\r
                                        Pipe_Unfreeze();\r
                                        Pipe_ClearOUT();\r


@@ -371,7 +372,7 @@
                                Pipe_Write_16_LE(Sample);\r
                                Pipe_Write_8(Sample >> 16);\r
 \r
                                Pipe_Write_16_LE(Sample);\r
                                Pipe_Write_8(Sample >> 16);\r
 \r

-                               if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataINPipeSize)\r
+                               if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataOUTPipeSize)\r

                                {\r
                                        Pipe_Unfreeze();\r
                                        Pipe_ClearOUT();\r
                                {\r
                                        Pipe_Unfreeze();\r
                                        Pipe_ClearOUT();\r