Rewritten event system to remove all macros, to make user code clearer.

[pub/lufa.git] / Demos / OTG / TestApp / TestEvents.h

diff --git a/Demos/OTG/TestApp/TestEvents.h b/Demos/OTG/TestApp/TestEvents.h
index a1f149f..656c070 100644 (file)
--- a/Demos/OTG/TestApp/TestEvents.h
+++ b/Demos/OTG/TestApp/TestEvents.h
@@ -46,58 +46,6 @@
                #include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes\r
                #include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management\r
 \r
                #include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes\r
                #include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management\r
 \r

-       /* Event Catch List: */\r
-               /** Indicates that this module will catch the USB_VBUSChange event when thrown by the library. */\r
-               HANDLES_EVENT(USB_VBUSChange);\r
-\r
-               /** Indicates that this module will catch the USB_VBUSConnect event when thrown by the library. */\r
-               HANDLES_EVENT(USB_VBUSConnect);\r
-\r
-               /** Indicates that this module will catch the USB_VBUSDisconnect event when thrown by the library. */\r
-               HANDLES_EVENT(USB_VBUSDisconnect);\r
-\r
-               /** Indicates that this module will catch the USB_Connect event when thrown by the library. */\r
-               HANDLES_EVENT(USB_Connect);\r
-\r
-               /** Indicates that this module will catch the USB_Disconnect event when thrown by the library. */\r
-               HANDLES_EVENT(USB_Disconnect);\r
-\r
-               /** Indicates that this module will catch the USB_Suspend event when thrown by the library. */\r
-               HANDLES_EVENT(USB_Suspend);\r
-\r
-               /** Indicates that this module will catch the USB_WakeUp event when thrown by the library. */\r
-               HANDLES_EVENT(USB_WakeUp);\r
-\r
-               /** Indicates that this module will catch the USB_Reset event when thrown by the library. */\r
-               HANDLES_EVENT(USB_Reset);\r
-\r
-               /** Indicates that this module will catch the USB_UIDChange event when thrown by the library. */\r
-               HANDLES_EVENT(USB_UIDChange);\r
-\r
-               /** Indicates that this module will catch the USB_InitFailure event when thrown by the library. */\r
-               HANDLES_EVENT(USB_InitFailure);\r
-\r
-               /** Indicates that this module will catch the USB_HostError event when thrown by the library. */\r
-               HANDLES_EVENT(USB_HostError);\r
-\r
-               /** Indicates that this module will catch the USB_DeviceEnumerationFailed event when thrown by the library. */\r
-               HANDLES_EVENT(USB_DeviceEnumerationFailed);\r
-\r
-               /** Indicates that this module will catch the USB_DeviceError event when thrown by the library. */\r
-               HANDLES_EVENT(USB_DeviceError);\r
-\r
-               /** Indicates that this module will catch the USB_UnhandledControlPacket event when thrown by the library. */\r
-               HANDLES_EVENT(USB_UnhandledControlPacket);\r
-\r
-               /** Indicates that this module will catch the USB_ConfigurationChanged event when thrown by the library. */\r
-               HANDLES_EVENT(USB_ConfigurationChanged);\r
-\r
-               /** Indicates that this module will catch the USB_DeviceAttached event when thrown by the library. */\r
-               HANDLES_EVENT(USB_DeviceAttached);\r
-\r
-               /** Indicates that this module will catch the USB_DeviceUnattached event when thrown by the library. */\r
-               HANDLES_EVENT(USB_DeviceUnattached);\r
-\r

        /* Macros: */\r
                /** Prefix sent through the USART when an even fires before the actual event message. */\r
                #define EVENT_PREFIX ESC_INVERSE_ON "EVENT:" ESC_INVERSE_OFF " "\r
        /* Macros: */\r
                /** Prefix sent through the USART when an even fires before the actual event message. */\r
                #define EVENT_PREFIX ESC_INVERSE_ON "EVENT:" ESC_INVERSE_OFF " "\r


@@ -107,4 +55,23 @@
                        static void Abort_Program(void) ATTR_NO_RETURN;\r
                #endif\r
 \r
                        static void Abort_Program(void) ATTR_NO_RETURN;\r
                #endif\r
 \r

+               void EVENT_USB_VBUSChange(void);\r
+               void EVENT_USB_VBUSConnect(void);\r
+               void EVENT_USB_VBUSDisconnect(void);\r
+               void EVENT_USB_Connect(void);\r
+               void EVENT_USB_Disconnect(void);\r
+               void EVENT_USB_InitFailure(const uint8_t ErrorCode);\r
+               void EVENT_USB_UIDChange(void);\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 EVENT_USB_UnhandledControlPacket(void);\r
+               void EVENT_USB_ConfigurationChanged(void);\r
+               void EVENT_USB_Suspend(void);\r
+               void EVENT_USB_WakeUp(void);\r
+               void EVENT_USB_Reset(void);\r
+               void EVENT_USB_DeviceError(const uint8_t ErrorCode);            \r
+               \r

 #endif\r
 #endif\r