Commit of new class abstraction APIs for all device demos other than the MIDI demo...

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

diff --git a/Demos/Device/AudioInput/AudioInput.h b/Demos/Device/AudioInput/AudioInput.h
index a394492..e9f56b3 100644 (file)
--- a/Demos/Device/AudioInput/AudioInput.h
+++ b/Demos/Device/AudioInput/AudioInput.h
@@ -43,12 +43,13 @@
 \r
                #include "Descriptors.h"\r
                                \r
-               #include <LUFA/Version.h>                      // Library Version Information\r
-               #include <LUFA/Drivers/USB/USB.h>              // USB Functionality\r
-               #include <LUFA/Drivers/Board/LEDs.h>           // LEDs driver\r
-               #include <LUFA/Drivers/Peripheral/ADC.h>       // ADC driver\r
-               #include <LUFA/Scheduler/Scheduler.h>          // Simple scheduler for task management\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
+               \r
        /* Macros: */\r
                /** ADC channel number for the microphone input. */\r
                #define MIC_IN_ADC_CHANNEL               2\r
@@ -59,24 +60,19 @@
                /** Maximum ADC range for the microphone input. */\r
                #define ADC_MAX_RANGE                    0x3FF\r
 \r
-       /* Enums: */\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum AudioInput_StatusCodes_t\r
-               {\r
-                       Status_USBNotReady    = 0, /**< USB is not ready (disconnected from a USB host) */\r
-                       Status_USBEnumerating = 1, /**< USB interface is enumerating */\r
-                       Status_USBReady       = 2, /**< USB interface is connected and ready */\r
-               };\r
-\r
-       /* Task Definitions: */\r
-               TASK(USB_Audio_Task);\r
-\r
+       /* Macros: */\r
+               #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
+               #define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)\r
+               #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\r
+               #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
+               \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 UpdateStatus(uint8_t CurrentStatus);\r
-               \r
 #endif\r