Device mode class driver callbacks are now fired before the control request status...

[pub/USBasp.git] / Demos / Device / ClassDriver / AudioOutput / AudioOutput.h

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
index f8d703e..cf0034f 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -40,64 +40,17 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/power.h>\r
+               #include <avr/interrupt.h>\r
+               #include <stdlib.h>\r
 \r
                #include "Descriptors.h"\r
                \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
-               #include <LUFA/Drivers/Board/Joystick.h>\r
-               #include <LUFA/Drivers/Peripheral/ADC.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/Audio.h>\r
+               #include <LUFA/Drivers/USB/Class/Audio.h>\r
        \r
-       /* Macros: */\r
-               #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)\r
-                       #define TCCRxA          TCCR3A\r
-                       #define TCCRxB          TCCR3B\r
-                       #define OCRxA           OCR3A\r
-                       #define OCRxB           OCR3B\r
-                       #define WGMx0           WGM30\r
-                       #define WGMx2           WGM32\r
-                       #define COMxA1          COM3A1\r
-                       #define COMxA0          COM3A0\r
-                       #define COMxB1          COM3B1\r
-                       #define COMxB0          COM3B0\r
-                       #define CSx0            CS30\r
-               #else\r
-                       /** Timer count register used for left channel PWM audio output (or mixed output in mono output mode) */\r
-                       #define TCCRxA          TCCR1A\r
-\r
-                       /** Timer count register used for right channel PWM audio output */\r
-                       #define TCCRxB          TCCR1B\r
-\r
-                       /** Timer compare register used for left channel PWM audio output (or mixed output in mono output mode) */\r
-                       #define OCRxA           OCR1A\r
-\r
-                       /** Timer compare register used for right channel PWM audio output */\r
-                       #define OCRxB           OCR1B\r
-\r
-                       /** Timer control register mask used to select PWM mode */\r
-                       #define WGMx0           WGM10\r
-\r
-                       /** Timer control register mask used to select PWM mode */\r
-                       #define WGMx2           WGM12\r
-\r
-                       /** Timer control register mask used to set, clear or toggle channel output pin on match */\r
-                       #define COMxA1          COM1A1\r
-\r
-                       /** Timer control register mask used to set, clear or toggle channel output pin on match */\r
-                       #define COMxA0          COM1A0\r
-\r
-                       /** Timer control register mask used to set, clear or toggle channel output pin on match */\r
-                       #define COMxB1          COM1B1\r
-\r
-                       /** Timer control register mask used to set, clear or toggle channel output pin on match */\r
-                       #define COMxB0          COM1B0\r
-\r
-                       /** Timer control register mask used to start the timer at Fcpu clock rate */\r
-                       #define CSx0            CS10\r
-               #endif\r
-               \r
+       /* Macros: */           \r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
                #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
 \r
@@ -114,9 +67,9 @@
                void SetupHardware(void);\r
                void ProcessNextSample(void);\r
                \r
-               void EVENT_USB_Connect(void);\r
-               void EVENT_USB_Disconnect(void);\r
-               void EVENT_USB_ConfigurationChanged(void);\r
-               void EVENT_USB_UnhandledControlPacket(void);\r
+               void EVENT_USB_Device_Connect(void);\r
+               void EVENT_USB_Device_Disconnect(void);\r
+               void EVENT_USB_Device_ConfigurationChanged(void);\r
+               void EVENT_USB_Device_UnhandledControlRequest(void);\r
 \r
 #endif\r