Some minor whitespace corrections.

[pub/USBasp.git] / Demos / Device / Incomplete / Sideshow / Sideshow.h

diff --git a/Demos/Device/Incomplete/Sideshow/Sideshow.h b/Demos/Device/Incomplete/Sideshow/Sideshow.h
index 7b88182..4cdcb37 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Sideshow.h
+++ b/Demos/Device/Incomplete/Sideshow/Sideshow.h
@@ -34,31 +34,40 @@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
+               #include <avr/power.h>\r
 \r
                #include "Descriptors.h"\r
                #include "SideshowCommands.h"\r
 \r
-               #include <LUFA/Version.h>                    // Library Version Information\r
-               #include <LUFA/Common/ButtLoadTag.h>         // PROGMEM tags readable by the ButtLoad project\r
-               #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
-               #include <LUFA/Drivers/Board/HWB.h>          // HWB button driver\r
-               #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
-               #include <LUFA/Drivers/Board/Dataflash.h>    // Dataflash chip driver\r
-               #include <LUFA/Scheduler/Scheduler.h>        // Simple scheduler for task management\r
-               #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver\r
+               #include <LUFA/Version.h>
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r
+               #include <LUFA/Drivers/Peripheral/SerialStream.h>\r
 \r
        /* Macros: */\r
                #define REQ_GetOSFeatureDescriptor        0x01\r
                \r
                #define EXTENDED_COMPAT_ID_DESCRIPTOR     0x0004\r
 \r
-       /* Task Definitions: */\r
-               TASK(USB_Sideshow);\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 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
-       /* Event Handlers: */\r
-               HANDLES_EVENT(USB_Connect);\r
-               HANDLES_EVENT(USB_Disconnect);\r
-               HANDLES_EVENT(USB_ConfigurationChanged);\r
-               HANDLES_EVENT(USB_UnhandledControlPacket);\r
+       /* Function Prototypes: */\r
+               void SetupHardware(void);\r
+               void SideShow_Task(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
 #endif\r