aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-05-20 16:40:26 +0200
committerDean Camera <dean@fourwalledcubicle.com>2013-05-20 16:40:26 +0200
commitf8353236821c2194f3fffd38c26f77d056e66555 (patch)
treea17706597917aa8ea3f5b22ce93dc4b1afa3fced /Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c
parentb37bde56753fc19bcab04ab4e24d5922b65026a4 (diff)
parent10448970e5c4c5ad374f0887532fedc0daf97c42 (diff)
downloadlufa-f8353236821c2194f3fffd38c26f77d056e66555.tar.gz
lufa-f8353236821c2194f3fffd38c26f77d056e66555.tar.bz2
lufa-f8353236821c2194f3fffd38c26f77d056e66555.zip
Merge branch 'XMEGA-Demo-Ports-ClockOnly'
Diffstat (limited to 'Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c')
-rw-r--r--Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c b/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c
index 30e60e5da..6faa8fe30 100644
--- a/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c
+++ b/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.c
@@ -111,12 +111,14 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
/** Configures the board hardware and chip peripherals for the demo's functionality. */
void SetupHardware(void)
{
+#if (ARCH == ARCH_AVR8)
/* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF);
wdt_disable();
/* Disable clock division */
clock_prescale_set(clock_div_1);
+#endif
/* Hardware Initialization */
Serial_Init(9600, false);
@@ -128,9 +130,9 @@ void SetupHardware(void)
/* Create a stdio stream for the serial port for stdin and stdout */
Serial_CreateStream(NULL);
-
+
/* Start the ADC conversion in free running mode */
- ADC_StartReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | ADC_GET_CHANNEL_MASK(MIC_IN_ADC_CHANNEL));
+ ADC_StartReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | ADC_GET_CHANNEL_MASK(MIC_IN_ADC_CHANNEL));
}
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and