X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/4897ef8972d1cff73d39abf282e85d253dd119f2..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 4651bf153..c4fbc3d9c 100644
--- a/LUFA/Drivers/USB/Class/Device/Audio.c
+++ b/LUFA/Drivers/USB/Class/Device/Audio.c
@@ -28,14 +28,17 @@
   this software.
 */
 
+#include "../../HighLevel/USBMode.h"
+#if defined(USB_CAN_BE_DEVICE)
+
 #include "Audio.h"
 
-void USB_Audio_ProcessControlPacket(USB_ClassInfo_Audio_t* AudioInterfaceInfo)
+void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
 	if (!(Endpoint_IsSETUPReceived()))
 	  return;
 	  
-	if (USB_ControlRequest.wIndex != AudioInterfaceInfo->StreamingInterfaceNumber)
+	if (USB_ControlRequest.wIndex != AudioInterfaceInfo->Config.StreamingInterfaceNumber)
 	  return;
 
 	switch (USB_ControlRequest.bRequest)
@@ -45,115 +48,124 @@ void USB_Audio_ProcessControlPacket(USB_ClassInfo_Audio_t* AudioInterfaceInfo)
 			{
 				Endpoint_ClearSETUP();
 				
-				AudioInterfaceInfo->InterfaceEnabled = (USB_ControlRequest.wValue != 0);
+				AudioInterfaceInfo->State.InterfaceEnabled = (USB_ControlRequest.wValue != 0);
 				  
-				while (!(Endpoint_IsINReady()));
-				Endpoint_ClearIN();
+				Endpoint_ClearStatusStage();
 			}
 
 			break;
 	}
 }
 
-bool USB_Audio_ConfigureEndpoints(USB_ClassInfo_Audio_t* AudioInterfaceInfo)
+bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* AudioInterfaceInfo)
 {
-	if (AudioInterfaceInfo->DataINEndpointNumber)
+	memset(&AudioInterfaceInfo->State, 0x00, sizeof(AudioInterfaceInfo->State));
+
+	if (AudioInterfaceInfo->Config.DataINEndpointNumber)
 	{
-		if (!(Endpoint_ConfigureEndpoint(AudioInterfaceInfo->DataINEndpointNumber, EP_TYPE_ISOCHRONOUS,
-										 ENDPOINT_DIR_IN, AudioInterfaceInfo->DataINEndpointSize,
+		if (!(Endpoint_ConfigureEndpoint(AudioInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_ISOCHRONOUS,
+										 ENDPOINT_DIR_IN, AudioInterfaceInfo->Config.DataINEndpointSize,
 										 ENDPOINT_BANK_DOUBLE)))
 		{
 			return false;
 		}
 	}
 
-	if (AudioInterfaceInfo->DataOUTEndpointNumber)
+	if (AudioInterfaceInfo->Config.DataOUTEndpointNumber)
 	{
-		if (!(Endpoint_ConfigureEndpoint(AudioInterfaceInfo->DataOUTEndpointNumber, EP_TYPE_ISOCHRONOUS,
-										 ENDPOINT_DIR_OUT, AudioInterfaceInfo->DataOUTEndpointSize,
+		if (!(Endpoint_ConfigureEndpoint(AudioInterfaceInfo->Config.DataOUTEndpointNumber, EP_TYPE_ISOCHRONOUS,
+										 ENDPOINT_DIR_OUT, AudioInterfaceInfo->Config.DataOUTEndpointSize,
 										 ENDPOINT_BANK_DOUBLE)))
 		{
 			return false;
 		}
 	}
-
+	
 	return true;
 }
 
-void USB_Audio_USBTask(USB_ClassInfo_Audio_t* AudioInterfaceInfo)
+void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
 
 }
 
-int8_t USB_Audio_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 USB_Audio_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 USB_Audio_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 USB_Audio_WriteSample8(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 USB_Audio_WriteSample16(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 USB_Audio_WriteSample24(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 USB_Audio_IsSampleReceived(USB_ClassInfo_Audio_t* AudioInterfaceInfo)
+bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
-	Endpoint_SelectEndpoint(AudioInterfaceInfo->DataOUTEndpointNumber);
+	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
+	  return false;
+	
+	Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataOUTEndpointNumber);	
 	return Endpoint_IsOUTReceived();
 }
 
-bool USB_Audio_IsReadyForNextSample(USB_ClassInfo_Audio_t* AudioInterfaceInfo)
+bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
-	Endpoint_SelectEndpoint(AudioInterfaceInfo->DataINEndpointNumber);
+	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
+	  return false;
+	
+	Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataINEndpointNumber);
 	return Endpoint_IsINReady();
 }
+
+#endif
\ No newline at end of file