X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/03cdb09071c5c9ed9dd0f851a0980d360a4492d0..106f0eee17bbe837c9f94bdcf13d28e2952f1aef:/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c?ds=sidebyside

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
index 22d19a4d5..56b39362d 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2018.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2018  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
@@ -44,8 +44,8 @@ USB_ClassInfo_Audio_Device_t Speaker_Audio_Interface =
 	{
 		.Config =
 			{
-				.ControlInterfaceNumber   = 0,
-				.StreamingInterfaceNumber = 1,
+				.ControlInterfaceNumber   = INTERFACE_ID_AudioControl,
+				.StreamingInterfaceNumber = INTERFACE_ID_AudioStream,
 				.DataOUTEndpoint          =
 					{
 						.Address          = AUDIO_STREAM_EPADDR,
@@ -79,12 +79,14 @@ int main(void)
 /** 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 */
 	LEDs_Init();
@@ -302,7 +304,7 @@ bool CALLBACK_Audio_Device_GetSetInterfaceProperty(USB_ClassInfo_Audio_Device_t*
                                                    const uint8_t EntityAddress,
                                                    const uint16_t Parameter,
                                                    uint16_t* const DataLength,
-                                                   uint8_t* Data) 
+                                                   uint8_t* Data)
 {
 	/* No audio interface entities in the device descriptor, thus no properties to get or set. */
 	return false;