Allow the title of top level pages to be overridden in the Atmel Studio help.

[pub/USBasp.git] / Demos / Device / ClassDriver / AudioInput / Descriptors.h

diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.h b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
index 5ca7afb..81ea989 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  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
@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -38,22 +38,17 @@
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
-               #include <LUFA/Drivers/USB/Class/Audio.h>
 
                #include <avr/pgmspace.h>
 
-       /* Macros: */
-               /** Endpoint number of the Audio isochronous streaming data endpoint. */
-               #define AUDIO_STREAM_EPNUM           1
+               #include "Config/AppConfig.h"
 
-               /** 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)
+       /* Macros: */
+               /** Endpoint address of the Audio isochronous streaming data IN endpoint. */
+               #define AUDIO_STREAM_EPADDR           (ENDPOINT_DIR_IN | 1)
 
-               /** Sample frequency of the data being transmitted through the streaming endpoint. */
-               #define AUDIO_SAMPLE_FREQUENCY       48000
+               /** Endpoint size in bytes of the Audio isochronous streaming data endpoint. */
+               #define AUDIO_STREAM_EPSIZE           256
 
        /* Type Defines: */
                /** Type define for the device configuration descriptor structure. This must be defined in the
@@ -63,14 +58,19 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t     Config;
+
+                       // Audio Control Interface
                        USB_Descriptor_Interface_t                Audio_ControlInterface;
                        USB_Audio_Descriptor_Interface_AC_t       Audio_ControlInterface_SPC;
                        USB_Audio_Descriptor_InputTerminal_t      Audio_InputTerminal;
                        USB_Audio_Descriptor_OutputTerminal_t     Audio_OutputTerminal;
+
+                       // Audio Streaming Interface
                        USB_Descriptor_Interface_t                Audio_StreamInterface_Alt0;
                        USB_Descriptor_Interface_t                Audio_StreamInterface_Alt1;
                        USB_Audio_Descriptor_Interface_AS_t       Audio_StreamInterface_SPC;
                        USB_Audio_Descriptor_Format_t             Audio_AudioFormat;
+                       USB_Audio_SampleFreq_t                    Audio_AudioFormatSampleRates[5];
                        USB_Audio_Descriptor_StreamEndpoint_Std_t Audio_StreamEndpoint;
                        USB_Audio_Descriptor_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC;
                } USB_Descriptor_Configuration_t;