diff options
Diffstat (limited to 'Demos/Device/ClassDriver/AudioOutput')
| -rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/AudioOutput.c | 4 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/AudioOutput.h | 3 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/asf.xml | 9 | 
3 files changed, 9 insertions, 7 deletions
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c index 22d19a4d5..81fd95b16 100644 --- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c +++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c @@ -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; diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h index 802bec924..bf2d3c8a7 100644 --- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h +++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h @@ -48,6 +48,7 @@  		#include <LUFA/Drivers/Board/LEDs.h>  		#include <LUFA/Drivers/USB/USB.h> +		#include <LUFA/Platform/Platform.h>  	/* Macros: */  		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ @@ -81,6 +82,6 @@  		                                                   const uint8_t EntityAddress,  		                                                   const uint16_t Parameter,  		                                                   uint16_t* const DataLength, -		                                                   uint8_t* Data);		 +		                                                   uint8_t* Data);  #endif diff --git a/Demos/Device/ClassDriver/AudioOutput/asf.xml b/Demos/Device/ClassDriver/AudioOutput/asf.xml index dacdbd5c6..c7b0768ed 100644 --- a/Demos/Device/ClassDriver/AudioOutput/asf.xml +++ b/Demos/Device/ClassDriver/AudioOutput/asf.xml @@ -1,14 +1,14 @@  <asf xmlversion="1.0">
 -	<project caption="Audio Output Device Demo (Class Driver APIs)" id="lufa.demos.device.class.audio_output.example">
 +	<project caption="Audio Output Device Demo (Class Driver APIs)" id="lufa.demos.device.class.audio_output.example.avr8">
  		<require idref="lufa.demos.device.class.audio_output"/>
  		<require idref="lufa.boards.dummy.avr8"/>
  		<generator value="as5_8"/>
  		<device-support value="at90usb1287"/>
 -		<config name="lufa.drivers.board.name" value="usbkey"/>
 +		<config name="lufa.drivers.board.name" value="none"/>
 -		<build type="define" name="F_CPU" value="8000000UL"/>
 -		<build type="define" name="F_USB" value="8000000UL"/>
 +		<build type="define" name="F_CPU" value="16000000UL"/>
 +		<build type="define" name="F_USB" value="16000000UL"/>
  	</project>
  	<module type="application" id="lufa.demos.device.class.audio_output" caption="Audio Output Device Demo (Class Driver APIs)">
 @@ -45,6 +45,5 @@  		<require idref="lufa.drivers.usb"/>
  		<require idref="lufa.drivers.board"/>
  		<require idref="lufa.drivers.board.leds"/>
 -		<require idref="lufa.drivers.board.buttons"/>
  	</module>
  </asf>
  | 
