X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/afe6ae14023c7040befe73e49d00077d3425c564..a9e0935a90346beb0c981924becc1f55d969a08b:/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h?ds=sidebyside

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
index ecc4e6fae..cf0034f87 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, provided that the above copyright notice appear in all
-  copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
+  Copyright 2010  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
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -40,64 +40,17 @@
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/power.h>
+		#include <avr/interrupt.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/Audio.h>
 	
-	/* Macros: */
-		#if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
-			#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: */		
 		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
 		#define LEDMASK_USB_NOTREADY      LEDS_LED1
 
@@ -114,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