diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-09 08:00:19 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-09 08:00:19 +0000 |
| commit | 6e2a3174a5e08528299c208bf9415beccf43840a (patch) | |
| tree | 00f7210e6f054e0700717831f7f0a1ac545ab040 | |
| parent | e5e34f91fa88fb95ab83c6cb8e10d313d4157a67 (diff) | |
| download | lufa-6e2a3174a5e08528299c208bf9415beccf43840a.tar.gz lufa-6e2a3174a5e08528299c208bf9415beccf43840a.tar.bz2 lufa-6e2a3174a5e08528299c208bf9415beccf43840a.zip | |
Fix errors in the library Host mode Audio Class driver.
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/Audio.c | 8 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/Audio.h | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/LUFA/Drivers/USB/Class/Host/Audio.c b/LUFA/Drivers/USB/Class/Host/Audio.c index 80ab2d1e5..e02ce30eb 100644 --- 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 {
uint8_t RequestType;
uint8_t EndpointAddress;
-
+
if (EndpointProperty & 0x80)
- RequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE);
+ RequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT);
else
- RequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE);
+ RequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_ENDPOINT);
Pipe_SelectPipe(DataPipeIndex);
EndpointAddress = Pipe_GetBoundEndpointAddress();
@@ -233,7 +233,7 @@ uint8_t Audio_GetSetEndpointProperty(USB_ClassInfo_Audio_Host_t* const AudioInte Pipe_SelectPipe(PIPE_CONTROLPIPE);
- return USB_Host_SendControlRequest(Data);
+ return USB_Host_SendControlRequest(Data);
}
#endif
diff --git a/LUFA/Drivers/USB/Class/Host/Audio.h b/LUFA/Drivers/USB/Class/Host/Audio.h index 1cac3e7ac..befcc2f59 100644 --- a/LUFA/Drivers/USB/Class/Host/Audio.h +++ b/LUFA/Drivers/USB/Class/Host/Audio.h @@ -194,10 +194,11 @@ bool SampleReceived = false;
- Pipe_SelectPipe(AudioInterfaceInfo->Config.DataOUTPipeNumber);
+ Pipe_SelectPipe(AudioInterfaceInfo->Config.DataINPipeNumber);
Pipe_Unfreeze();
SampleReceived = Pipe_IsINReceived();
Pipe_Freeze();
+
return SampleReceived;
}
@@ -218,7 +219,7 @@ if ((USB_HostState != HOST_STATE_Configured) || !(AudioInterfaceInfo->State.IsActive))
return false;
- Pipe_SelectPipe(AudioInterfaceInfo->Config.DataINPipeNumber);
+ Pipe_SelectPipe(AudioInterfaceInfo->Config.DataOUTPipeNumber);
return Pipe_IsOUTReady();
}
@@ -324,7 +325,7 @@ {
Pipe_Write_8(Sample);
- if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataINPipeSize)
+ if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataOUTPipeSize)
{
Pipe_Unfreeze();
Pipe_ClearOUT();
@@ -347,7 +348,7 @@ {
Pipe_Write_16_LE(Sample);
- if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataINPipeSize)
+ if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataOUTPipeSize)
{
Pipe_Unfreeze();
Pipe_ClearOUT();
@@ -371,7 +372,7 @@ Pipe_Write_16_LE(Sample);
Pipe_Write_8(Sample >> 16);
- if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataINPipeSize)
+ if (Pipe_BytesInPipe() == AudioInterfaceInfo->State.DataOUTPipeSize)
{
Pipe_Unfreeze();
Pipe_ClearOUT();
|