X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/137ce280c1e9c33e9393f1dfd6bb160c131bd1a4..0e434c8f8fc1e33230a9b9c54583d59a232553e5:/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c?ds=sidebyside

diff --git a/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c b/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c
index c43b3ab3a..833be1b2c 100644
--- a/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c
+++ b/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -44,7 +44,10 @@ USB_ClassInfo_Audio_Host_t Speaker_Audio_Interface =
 	{
 		.Config =
 			{
-				.DataOUTPipeNumber = 1,
+				.DataOUTPipe            =
+					{
+						.Address        = (PIPE_DIR_OUT | 2),
+					},
 			},
 	};
 
@@ -81,11 +84,11 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
 		#if defined(USE_TEST_TONE)
 			static uint8_t SquareWaveSampleCount;
 			static int16_t CurrentWaveValue;
-			
+
 			/* In test tone mode, generate a square wave at 1/256 of the sample rate */
 			if (SquareWaveSampleCount++ == 0xFF)
 			  CurrentWaveValue ^= 0x8000;
-			
+
 			/* Only generate audio if the board button is being pressed */
 			AudioSample = (Buttons_GetStatus() & BUTTONS_BUTTON1) ? CurrentWaveValue : 0;
 		#else
@@ -97,11 +100,11 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
 			AudioSample -= (SAMPLE_MAX_RANGE / 2);
 			#endif
 		#endif
-		
-		Audio_Host_WriteSample16(&Speaker_Audio_Interface, AudioSample);	
+
+		Audio_Host_WriteSample16(&Speaker_Audio_Interface, AudioSample);
 		Audio_Host_WriteSample16(&Speaker_Audio_Interface, AudioSample);
 	}
-	
+
 	Pipe_SelectPipe(PrevPipe);
 }
 
@@ -182,16 +185,18 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
 	{
 		puts_P(PSTR("Error Enabling Audio Stream.\r\n"));
 		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		USB_Host_SetDeviceConfiguration(0);
 		return;
 	}
-	
+
 	USB_Audio_SampleFreq_t SampleRate = AUDIO_SAMPLE_FREQ(48000);
-	if (Audio_Host_GetSetEndpointProperty(&Speaker_Audio_Interface, Speaker_Audio_Interface.Config.DataOUTPipeNumber,
+	if (Audio_Host_GetSetEndpointProperty(&Speaker_Audio_Interface, Speaker_Audio_Interface.Config.DataOUTPipe.Address,
 	                                      AUDIO_REQ_SetCurrent, AUDIO_EPCONTROL_SamplingFreq,
 	                                      sizeof(SampleRate), &SampleRate) != HOST_SENDCONTROL_Successful)
 	{
 		puts_P(PSTR("Error Setting Audio Sampling Frequency.\r\n"));
 		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		USB_Host_SetDeviceConfiguration(0);
 		return;
 	}