Commit for the 090810 release.

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

diff --git a/Demos/Device/LowLevel/AudioInput/AudioInput.h b/Demos/Device/LowLevel/AudioInput/AudioInput.h
index a394492..f74491d 100644 (file)
--- a/Demos/Device/LowLevel/AudioInput/AudioInput.h
+++ b/Demos/Device/LowLevel/AudioInput/AudioInput.h
@@ -43,40 +43,40 @@
 \r
                #include "Descriptors.h"\r
                                \r
 \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
+               #include <LUFA/Version.h>\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r
+               #include <LUFA/Drivers/Peripheral/ADC.h>\r

 \r
        /* Macros: */\r
                /** ADC channel number for the microphone input. */\r
 \r
        /* Macros: */\r
                /** ADC channel number for the microphone input. */\r

-               #define MIC_IN_ADC_CHANNEL               2\r
+               #define MIC_IN_ADC_CHANNEL        2\r

                \r
                /** Maximum ADC sample value for the microphone input. */\r
                \r
                /** Maximum ADC sample value for the microphone input. */\r

-               #define SAMPLE_MAX_RANGE                 0xFFFF\r
+               #define SAMPLE_MAX_RANGE          0xFFFF\r

 \r
                /** Maximum ADC range for the microphone input. */\r
 \r
                /** Maximum ADC range for the microphone input. */\r

-               #define ADC_MAX_RANGE                    0x3FF\r
+               #define ADC_MAX_RANGE             0x3FF\r

 \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
+               /** 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
 \r

-       /* Task Definitions: */\r
-               TASK(USB_Audio_Task);\r
+               /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */\r
+               #define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)\r
+\r
+               /** LED mask for the library LED driver, to indicate that the USB interface is ready. */\r
+               #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\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
        /* Function Prototypes: */\r
 \r
        /* Function Prototypes: */\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 SetupHardware(void);\r
+               void USB_Audio_Task(void);\r

 \r
 \r

-               void UpdateStatus(uint8_t CurrentStatus);\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