X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/b9b03aadb219d06fbad9d110e508db93e45461af..28f1ac81176bbcd9fd13d94e61323522a5279d27:/Demos/Device/ClassDriver/AudioInput/Descriptors.h

diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.h b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
index 0da895236..9bc94f39f 100644
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, provided that the above copyright notice appear in all
-  copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -38,27 +38,23 @@
 
 	/* Includes: */
 		#include <LUFA/Drivers/USB/USB.h>
-		#include <LUFA/Drivers/USB/Class/Device/Audio.h>
+		#include <LUFA/Drivers/USB/Class/Audio.h>
 
 		#include <avr/pgmspace.h>
 
 	/* Macros: */
-		#if defined(USB_FULL_CONTROLLER) || defined(__DOXYGEN__)
-			/** Endpoint number of the Audio isochronous streaming data endpoint. */
-			#define AUDIO_STREAM_EPNUM       1
-		#else
-			#define AUDIO_STREAM_EPNUM       3		
-		#endif
+		/** Endpoint number of the Audio isochronous streaming data endpoint. */
+		#define AUDIO_STREAM_EPNUM           1
 		
 		/** Endpoint size in bytes of the Audio isochronous streaming data endpoint. The Windows audio stack requires
 		 *  at least 192 bytes for correct output, thus the smaller 128 byte maximum endpoint size on some of the smaller
 		 *  USB AVR models will result in unavoidable distorted output.
 		 */
 		#define AUDIO_STREAM_EPSIZE          ENDPOINT_MAX_SIZE(AUDIO_STREAM_EPNUM)
-		
+
 		/** Sample frequency of the data being transmitted through the streaming endpoint. */
 		#define AUDIO_SAMPLE_FREQUENCY       48000
-		
+
 	/* Type Defines: */
 		/** Type define for the device configuration descriptor structure. This must be defined in the
 		 *  application code, as the configuration descriptor contains several sub-descriptors which
@@ -67,18 +63,18 @@
 		typedef struct
 		{
 			USB_Descriptor_Configuration_Header_t Config;
-			USB_Descriptor_Interface_t            AudioControlInterface;
-			USB_AudioInterface_AC_t               AudioControlInterface_SPC;
-			USB_AudioInputTerminal_t              InputTerminal;
-			USB_AudioOutputTerminal_t             OutputTerminal;
-			USB_Descriptor_Interface_t            AudioStreamInterface_Alt0;
-			USB_Descriptor_Interface_t            AudioStreamInterface_Alt1;
-			USB_AudioInterface_AS_t               AudioStreamInterface_SPC;
-			USB_AudioFormat_t                     AudioFormat;
-			USB_AudioStreamEndpoint_Std_t         AudioEndpoint;
-			USB_AudioStreamEndpoint_Spc_t         AudioEndpoint_SPC;
+			USB_Descriptor_Interface_t            Audio_ControlInterface;
+			USB_Audio_Interface_AC_t              Audio_ControlInterface_SPC;
+			USB_Audio_InputTerminal_t             Audio_InputTerminal;
+			USB_Audio_OutputTerminal_t            Audio_OutputTerminal;
+			USB_Descriptor_Interface_t            Audio_StreamInterface_Alt0;
+			USB_Descriptor_Interface_t            Audio_StreamInterface_Alt1;
+			USB_Audio_Interface_AS_t              Audio_StreamInterface_SPC;
+			USB_Audio_Format_t                    Audio_AudioFormat;
+			USB_Audio_StreamEndpoint_Std_t        Audio_StreamEndpoint;
+			USB_Audio_StreamEndpoint_Spc_t        Audio_StreamEndpoint_SPC;
 		} USB_Descriptor_Configuration_t;
-		
+
 	/* Function Prototypes: */
 		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
 		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);