Mark build test makefiles as being incompatible with parallel make builds, as they...

[pub/USBasp.git] / Demos / Host / LowLevel / AudioOutputHost / AudioOutputHost.h

diff --git a/Demos/Host/LowLevel/AudioOutputHost/AudioOutputHost.h b/Demos/Host/LowLevel/AudioOutputHost/AudioOutputHost.h
index d4c87e3..189abcf 100644 (file)
--- a/Demos/Host/LowLevel/AudioOutputHost/AudioOutputHost.h
+++ b/Demos/Host/LowLevel/AudioOutputHost/AudioOutputHost.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -44,7 +44,6 @@
                #include <avr/interrupt.h>
                #include <stdio.h>
 
                #include <avr/interrupt.h>
                #include <stdio.h>
 

-               #include <LUFA/Version.h>

                #include <LUFA/Drivers/Misc/TerminalCodes.h>
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Peripheral/Serial.h>
                #include <LUFA/Drivers/Misc/TerminalCodes.h>
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Peripheral/Serial.h>


@@ -53,14 +52,9 @@
                #include <LUFA/Drivers/Board/Buttons.h>
 
                #include "ConfigDescriptor.h"
                #include <LUFA/Drivers/Board/Buttons.h>
 
                #include "ConfigDescriptor.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
 


@@ -80,7 +74,6 @@
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)
 
        /* Function Prototypes: */
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)
 
        /* Function Prototypes: */

-               void Audio_Task(void);

                void SetupHardware(void);
 
                void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
                void SetupHardware(void);
 
                void EVENT_USB_Host_HostError(const uint8_t ErrorCode);