Ensure all USB device class drivers have the same three main functions as their inter...

[pub/lufa.git] / Demos / Host / GenericHIDHost / GenericHIDHost.h

diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.h b/Demos/Host/GenericHIDHost/GenericHIDHost.h
index 8483fa6..7e2f8b8 100644 (file)
--- a/Demos/Host/GenericHIDHost/GenericHIDHost.h
+++ b/Demos/Host/GenericHIDHost/GenericHIDHost.h
@@ -47,7 +47,7 @@
                #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/AT90USBXXX/Serial_Stream.h>       // Serial stream driver\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
                \r
@@ -82,15 +82,14 @@
                        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
-               \r
-       /* Event Handlers: */\r
-               HANDLES_EVENT(USB_DeviceAttached);\r
-               HANDLES_EVENT(USB_DeviceUnattached);\r
-               HANDLES_EVENT(USB_DeviceEnumerationComplete);\r
-               HANDLES_EVENT(USB_HostError);\r
-               HANDLES_EVENT(USB_DeviceEnumerationFailed);\r
 \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
+\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