Commit for the 090810 release.

[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 d0e8db6..03e2a6d 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.h
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
@@ -41,8 +41,6 @@
                #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/Drivers/Board/Joystick.h>\r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/Board/Joystick.h>\r


@@ -50,6 +48,8 @@
                #include <LUFA/Drivers/USB/USB.h>\r
                #include <LUFA/Drivers/USB/Class/Audio.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\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


@@ -76,9 +76,9 @@
                void SetupHardware(void);\r
                void ProcessNextSample(void);\r
 \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
+               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