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

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

diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.h b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
index 8eac645..093f3ee 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.h
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2013.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2012  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
 
   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.
 
   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
   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


@@ -42,21 +42,15 @@
                #include <avr/power.h>
                #include <avr/interrupt.h>
 
                #include <avr/power.h>
                #include <avr/interrupt.h>
 

-               #include <LUFA/Version.h>

                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Board/Buttons.h>
                #include <LUFA/Drivers/Peripheral/ADC.h>
                #include <LUFA/Drivers/USB/USB.h>
 
                #include "Descriptors.h"
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Board/Buttons.h>
                #include <LUFA/Drivers/Peripheral/ADC.h>
                #include <LUFA/Drivers/USB/USB.h>
 
                #include "Descriptors.h"

+               #include "Config/AppConfig.h"

 
        /* Macros: */
 
        /* Macros: */

-               /** ADC channel number for the microphone input. */
-               #define MIC_IN_ADC_CHANNEL        2
-
-               /** ADC channel MUX mask for the microphone input. */
-               #define MIC_IN_ADC_MUX_MASK       ADC_CHANNEL2
-

                /** Maximum audio sample value for the microphone input. */
                #define SAMPLE_MAX_RANGE          0xFFFF
 
                /** Maximum audio sample value for the microphone input. */
                #define SAMPLE_MAX_RANGE          0xFFFF
 


@@ -83,12 +77,12 @@
                void EVENT_USB_Device_ConfigurationChanged(void);
                void EVENT_USB_Device_ControlRequest(void);
                
                void EVENT_USB_Device_ConfigurationChanged(void);
                void EVENT_USB_Device_ControlRequest(void);
                

-               void CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
-                                                          const uint8_t Property,
-                                                          const uint8_t EntityAddress,
-                                                          const uint16_t Parameter,
-                                                          uint16_t* const DataLength,
-                                                          uint8_t* Data);
+               bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
+                                                                 const uint8_t EndpointProperty,
+                                                                 const uint8_t EndpointAddress,
+                                                                 const uint8_t EndpointControl,
+                                                                 uint16_t* const DataLength,
+                                                                 uint8_t* Data) ATTR_NON_NULL_PTR_ARG(1);

                bool CALLBACK_Audio_Device_GetSetInterfaceProperty(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
                                                                   const uint8_t Property,
                                                                   const uint8_t EntityAddress,
                bool CALLBACK_Audio_Device_GetSetInterfaceProperty(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
                                                                   const uint8_t Property,
                                                                   const uint8_t EntityAddress,