Fix incorrect configuration in the ClassDriver AudioOutput demo.

Make all audio device Class Driver functions require a reference to the Audio class instance, so that the endpoint size can be checked (and to standardize the APIs).

Make LEDs more responsive in the AudioOutput device demos.

2 files changed, 33 insertions, 19 deletions

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/Audio.c
index b018d6686..210a3c800 100644
--- a/LUFA/Drivers/USB/Class/Device/Audio.c
+++ b/LUFA/Drivers/USB/Class/Device/Audio.c
@@ -89,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();

 }

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/Audio.h
index eef7f9049..2c91dae7c 100644
--- a/LUFA/Drivers/USB/Class/Device/Audio.h
+++ b/LUFA/Drivers/USB/Class/Device/Audio.h
@@ -125,54 +125,62 @@
 			 *  \note This should be preceeded immediately by a call to the USB_Audio_IsSampleReceived() function to ensure that

 			 *        the correct endpoint is selected and ready for data.

 			 *

+			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.

+			 *

 			 *  \return  Signed 8-bit audio sample from the audio interface

 			 */

-			int8_t Audio_Device_ReadSample8(void);

+			int8_t Audio_Device_ReadSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);

 

 			/** Reads the next 16-bit audio sample from the current audio interface.

 			 *

 			 *  \note This should be preceeded immediately by a call to the USB_Audio_IsSampleReceived() function to ensure that

 			 *        the correct endpoint is selected and ready for data.

 			 *

+			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.

+			 *

 			 *  \return  Signed 16-bit audio sample from the audio interface

 			 */

-			int16_t Audio_Device_ReadSample16(void);

+			int16_t Audio_Device_ReadSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);

 

 			/** Reads the next 24-bit audio sample from the current audio interface.

 			 *

 			 *  \note This should be preceeded immediately by a call to the USB_Audio_IsSampleReceived() function to ensure that

 			 *        the correct endpoint is selected and ready for data.

 			 *

+			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.

 			 *  \return  Signed 24-bit audio sample from the audio interface

 			 */

-			int32_t Audio_Device_ReadSample24(void);

+			int32_t Audio_Device_ReadSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);

 

 			/** Writes the next 8-bit audio sample to the current audio interface.

 			 *

 			 *  \note This should be preceeded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that

 			 *        the correct endpoint is selected and ready for data.

 			 *

+			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.

 			 *  \param[in] Sample  Signed 8-bit audio sample

 			 */

-			void Audio_Device_WriteSample8(const int8_t Sample);

+			void Audio_Device_WriteSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int8_t Sample);

 

 			/** Writes the next 16-bit audio sample to the current audio interface.

 			 *

 			 *  \note This should be preceeded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that

 			 *        the correct endpoint is selected and ready for data.

 			 *

+			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.

 			 *  \param[in] Sample  Signed 16-bit audio sample

 			 */

-			void Audio_Device_WriteSample16(const int16_t Sample);

+			void Audio_Device_WriteSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int16_t Sample);

 

 			/** Writes the next 24-bit audio sample to the current audio interface.

 			 *

 			 *  \note This should be preceeded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that

 			 *        the correct endpoint is selected and ready for data.

 			 *

+			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.

 			 *  \param[in] Sample  Signed 24-bit audio sample

 			 */

-			void Audio_Device_WriteSample24(const int32_t Sample);

+			void Audio_Device_WriteSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int32_t Sample);

 

 			/** Determines if the given audio interface is ready for a sample to be read from it.

 			 *