X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/b9b03aadb219d06fbad9d110e508db93e45461af..31d8ebebc0796873f7c70db80a04acdcbb307ed8:/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
index e8435e3ad..bc4c632d8 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
@@ -40,65 +40,17 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/power.h>
+		#include <stdlib.h>
 
 		#include "Descriptors.h"
 		
 		#include <LUFA/Version.h>
 		#include <LUFA/Drivers/Board/LEDs.h>
 		#include <LUFA/Drivers/Board/Joystick.h>
-		#include <LUFA/Drivers/Peripheral/ADC.h>
 		#include <LUFA/Drivers/USB/USB.h>
-		#include <LUFA/Drivers/USB/Class/Device/Audio.h>
+		#include <LUFA/Drivers/USB/Class/Audio.h>
 	
-	/* Macros: */
-		#if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)
-			#define TCCRxA          TCCR3A
-			#define TCCRxB          TCCR3B
-			#define OCRxA           OCR3A
-			#define OCRxB           OCR3B
-			#define WGMx0           WGM30
-			#define WGMx2           WGM32
-			#define COMxA1          COM3A1
-			#define COMxA0          COM3A0
-			#define COMxB1          COM3B1
-			#define COMxB0          COM3B0
-			#define CSx0            CS30
-		#else
-			/** Timer count register used for left channel PWM audio output (or mixed output in mono output mode) */
-			#define TCCRxA          TCCR1A
-
-			/** Timer count register used for right channel PWM audio output */
-			#define TCCRxB          TCCR1B
-
-			/** Timer compare register used for left channel PWM audio output (or mixed output in mono output mode) */
-			#define OCRxA           OCR1A
-
-			/** Timer compare register used for right channel PWM audio output */
-			#define OCRxB           OCR1B
-
-			/** Timer control register mask used to select PWM mode */
-			#define WGMx0           WGM10
-
-			/** Timer control register mask used to select PWM mode */
-			#define WGMx2           WGM12
-
-			/** Timer control register mask used to set, clear or toggle channel output pin on match */
-			#define COMxA1          COM1A1
-
-			/** Timer control register mask used to set, clear or toggle channel output pin on match */
-			#define COMxA0          COM1A0
-
-			/** Timer control register mask used to set, clear or toggle channel output pin on match */
-			#define COMxB1          COM1B1
-
-			/** Timer control register mask used to set, clear or toggle channel output pin on match */
-			#define COMxB0          COM1B0
-
-			/** Timer control register mask used to start the timer at Fcpu clock rate */
-			#define CSx0            CS10
-		#endif
-		
-	/* Macros: */
+	/* Macros: */		
 		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
 		#define LEDMASK_USB_NOTREADY      LEDS_LED1
 
@@ -115,9 +67,9 @@
 		void SetupHardware(void);
 		void ProcessNextSample(void);
 		
-		void EVENT_USB_Connect(void);
-		void EVENT_USB_Disconnect(void);
-		void EVENT_USB_ConfigurationChanged(void);
-		void EVENT_USB_UnhandledControlPacket(void);
+		void EVENT_USB_Device_Connect(void);
+		void EVENT_USB_Device_Disconnect(void);
+		void EVENT_USB_Device_ConfigurationChanged(void);
+		void EVENT_USB_Device_UnhandledControlRequest(void);
 
 #endif