Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and...

[pub/USBasp.git] / Demos / Host / LowLevel / GenericHIDHost / GenericHIDHost.h

diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h
index 7e2f8b8..bae5369 100644 (file)
--- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h
+++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h
@@ -44,53 +44,55 @@
                #include <avr/power.h>\r
                #include <stdio.h>\r
 \r
                #include <avr/power.h>\r
                #include <stdio.h>\r
 \r

-               #include <LUFA/Version.h>                                // Library Version Information\r
-               #include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes\r
-               #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
-               #include <LUFA/Drivers/Peripheral/SerialStream.h>        // Serial stream driver\r
-               #include <LUFA/Drivers/Board/LEDs.h>                     // LEDs driver\r
-               #include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management\r
+               #include <LUFA/Version.h>\r
+               #include <LUFA/Drivers/Misc/TerminalCodes.h>\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/Peripheral/SerialStream.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r

                \r
                #include "ConfigDescriptor.h"\r
                \r
        /* Macros: */\r
                /** Pipe number for the HID data IN pipe */\r
                \r
                #include "ConfigDescriptor.h"\r
                \r
        /* Macros: */\r
                /** Pipe number for the HID data IN pipe */\r

-               #define HID_DATA_IN_PIPE                 1\r
+               #define HID_DATA_IN_PIPE          1\r

                \r
                /** Pipe number for the HID data OUT pipe */\r
                \r
                /** Pipe number for the HID data OUT pipe */\r

-               #define HID_DATA_OUT_PIPE                2\r
+               #define HID_DATA_OUT_PIPE         2\r

 \r
                /** HID Class specific request to send a HID report to the device. */\r
 \r
                /** HID Class specific request to send a HID report to the device. */\r

-               #define REQ_SetReport                    0x09\r
-               \r
-               /** HID Report type specifier, for output reports to a device */\r
-               #define HID_REPORTTYPE_OUTPUT            0x02\r
-               \r
-               /** HID Report type specifier, for feature reports to a device */\r
-               #define HID_REPORTTYPE_FEATURE           0x03\r
+               #define REQ_SetReport             0x09\r

 \r
 \r

-       /* Task Definitions: */\r
-               TASK(USB_HID_Host);\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

-       /* Enums: */\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum GenricHIDHost_StatusCodes_t\r
-               {\r
-                       Status_USBNotReady      = 0, /**< USB is not ready (disconnected from a USB device) */\r
-                       Status_USBEnumerating   = 1, /**< USB interface is enumerating */\r
-                       Status_USBReady         = 2, /**< USB interface is connected and ready */\r
-                       Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */\r
-                       Status_HardwareError    = 4, /**< Hardware error while enumerating the attached USB device */\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
 \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
+               /** HID Report Type to indicate an IN report. */\r
+               #define REPORT_TYPE_IN           1\r
+\r
+               /** HID Report Type to indicate an OUT report. */\r
+               #define REPORT_TYPE_OUT          2\r
+\r
+               /** HID Report Type to indicate a FEATURE report. */\r
+               #define REPORT_TYPE_FEATURE      3\r
+               \r

        /* Function Prototypes: */\r
        /* Function Prototypes: */\r

-               void EVENT_USB_HostError(const uint8_t ErrorCode);\r
-               void EVENT_USB_DeviceAttached(void);\r
-               void EVENT_USB_DeviceUnattached(void);\r
-               void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);\r
-               void EVENT_USB_DeviceEnumerationComplete(void);\r
+               void SetupHardware(void);\r
+               void HID_Host_Task(void);\r
+       \r
+               void EVENT_USB_Host_HostError(const uint8_t ErrorCode);\r
+               void EVENT_USB_Host_DeviceAttached(void);\r
+               void EVENT_USB_Host_DeviceUnattached(void);\r
+               void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);\r
+               void EVENT_USB_Host_DeviceEnumerationComplete(void);\r

 \r
 \r

-               void UpdateStatus(uint8_t CurrentStatus);\r

                void ReadNextReport(void);\r
                void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength);\r
                \r
                void ReadNextReport(void);\r
                void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength);\r
                \r