Fixed AVRISP PDI race condition where the guard time between direction changes could...

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

diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.h b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
index e4dd7fe..38a089b 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.h
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
@@ -9,13 +9,13 @@
 /*\r
   Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\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
+  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
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -41,26 +41,24 @@
                #include <avr/wdt.h>\r
                #include <avr/power.h>\r
 \r
                #include <avr/wdt.h>\r
                #include <avr/power.h>\r
 \r

-               #include "Descriptors.h"\r
-                               \r

                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\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/Peripheral/ADC.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r

-               #include <LUFA/Drivers/USB/Class/Device/Audio.h>\r
-               \r
+               #include <LUFA/Drivers/USB/Class/Audio.h>\r
+\r
+               #include "Descriptors.h"\r
+\r

        /* Macros: */\r
                /** ADC channel number for the microphone input. */\r
                #define MIC_IN_ADC_CHANNEL        2\r
        /* Macros: */\r
                /** ADC channel number for the microphone input. */\r
                #define MIC_IN_ADC_CHANNEL        2\r

-               \r
+\r

                /** Maximum ADC sample value for the microphone input. */\r
                #define SAMPLE_MAX_RANGE          0xFFFF\r
 \r
                /** Maximum ADC range for the microphone input. */\r
                #define ADC_MAX_RANGE             0x3FF\r
 \r
                /** Maximum ADC sample value for the microphone input. */\r
                #define SAMPLE_MAX_RANGE          0xFFFF\r
 \r
                /** Maximum ADC range for the microphone input. */\r
                #define ADC_MAX_RANGE             0x3FF\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
                /** 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


@@ -72,14 +70,14 @@
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r

-               \r
+\r

        /* Function Prototypes: */\r
                void SetupHardware(void);\r
                void ProcessNextSample(void);\r
        /* Function Prototypes: */\r
                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
+\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
 \r
 #endif\r