X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f1076ac4d6e56bff7fb6d2126746af1108211370..f9f1bcc25c17b031029200cd9648d76d4ee39dc4:/LUFA/Drivers/USB/Class/Device/Audio.c

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/Audio.c
index d117bedf6..c4fbc3d9c 100644
--- a/LUFA/Drivers/USB/Class/Device/Audio.c
+++ b/LUFA/Drivers/USB/Class/Device/Audio.c
@@ -33,7 +33,7 @@
 
 #include "Audio.h"
 
-void Audio_Device_ProcessControlPacket(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
+void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
 	if (!(Endpoint_IsSETUPReceived()))
 	  return;
@@ -50,8 +50,7 @@ void Audio_Device_ProcessControlPacket(USB_ClassInfo_Audio_Device_t* const Audio
 				
 				AudioInterfaceInfo->State.InterfaceEnabled = (USB_ControlRequest.wValue != 0);
 				  
-				while (!(Endpoint_IsINReady()));
-				Endpoint_ClearIN();
+				Endpoint_ClearStatusStage();
 			}
 
 			break;
@@ -60,6 +59,8 @@ void Audio_Device_ProcessControlPacket(USB_ClassInfo_Audio_Device_t* const Audio
 
 bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* AudioInterfaceInfo)
 {
+	memset(&AudioInterfaceInfo->State, 0x00, sizeof(AudioInterfaceInfo->State));
+
 	if (AudioInterfaceInfo->Config.DataINEndpointNumber)
 	{
 		if (!(Endpoint_ConfigureEndpoint(AudioInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_ISOCHRONOUS,
@@ -79,7 +80,7 @@ bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* AudioInterfac
 			return false;
 		}
 	}
-
+	
 	return true;
 }
 
@@ -88,75 +89,81 @@ void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo
 
 }
 
-int8_t Audio_Device_ReadSample8(void)
+int8_t Audio_Device_ReadSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
 	int8_t Sample;
 
 	Sample = Endpoint_Read_Byte();
 
-	if (!(Endpoint_IsReadWriteAllowed()))
+	if (!(Endpoint_BytesInEndpoint()))
 	  Endpoint_ClearOUT();
 	
 	return Sample;
 }
 
-int16_t Audio_Device_ReadSample16(void)
+int16_t Audio_Device_ReadSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
 	int16_t Sample;
 
 	Sample = (int16_t)Endpoint_Read_Word_LE();
 		  
-	if (!(Endpoint_IsReadWriteAllowed()))
+	if (!(Endpoint_BytesInEndpoint()))
 	  Endpoint_ClearOUT();
 
 	return Sample;
 }
 
-int32_t Audio_Device_ReadSample24(void)
+int32_t Audio_Device_ReadSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
 	int32_t Sample;
 
 	Sample = (((uint32_t)Endpoint_Read_Byte() << 16) | Endpoint_Read_Word_LE());
 		  
-	if (!(Endpoint_IsReadWriteAllowed()))
+	if (!(Endpoint_BytesInEndpoint()))
 	  Endpoint_ClearOUT();
 
 	return Sample;
 }
 
-void Audio_Device_WriteSample8(const int8_t Sample)
+void Audio_Device_WriteSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int8_t Sample)
 {
 	Endpoint_Write_Byte(Sample);
 
-	if (!(Endpoint_IsReadWriteAllowed()))
+	if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
 	  Endpoint_ClearIN();
 }
 
-void Audio_Device_WriteSample16(const int16_t Sample)
+void Audio_Device_WriteSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int16_t Sample)
 {
 	Endpoint_Write_Word_LE(Sample);
 
-	if (!(Endpoint_IsReadWriteAllowed()))
+	if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
 	  Endpoint_ClearIN();
 }
 
-void Audio_Device_WriteSample24(const int32_t Sample)
+void Audio_Device_WriteSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int32_t Sample)
 {
 	Endpoint_Write_Byte(Sample >> 16);
 	Endpoint_Write_Word_LE(Sample);
 
-	if (!(Endpoint_IsReadWriteAllowed()))
+	if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
 	  Endpoint_ClearIN();
 }
 
 bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
-	Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataOUTEndpointNumber);
+	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
+	  return false;
+	
+	Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataOUTEndpointNumber);	
 	return Endpoint_IsOUTReceived();
 }
 
 bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
+	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
+	  return false;
+	
 	Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataINEndpointNumber);
 	return Endpoint_IsINReady();
 }