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

[pub/USBasp.git] / Demos / Device / MassStorage / MassStorage.h

diff --git a/Demos/Device/MassStorage/MassStorage.h b/Demos/Device/MassStorage/MassStorage.h
index f0baf14..afe9872 100644 (file)
--- a/Demos/Device/MassStorage/MassStorage.h
+++ b/Demos/Device/MassStorage/MassStorage.h
@@ -130,23 +130,12 @@
        /* Task Definitions: */\r
                TASK(USB_MassStorage);\r
                \r
-       /* Stream Callbacks: */\r
-               STREAM_CALLBACK(AbortOnMassStoreReset);\r
-\r
-       /* Event Handlers: */\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_ConfigurationChanged event when thrown by the library. */\r
-               HANDLES_EVENT(USB_ConfigurationChanged);\r
-\r
-               /** Indicates that this module will catch the USB_UnhandledControlPacket event when thrown by the library. */\r
-               HANDLES_EVENT(USB_UnhandledControlPacket);\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
+\r
                void UpdateStatus(uint8_t CurrentStatus);\r
 \r
                #if defined(INCLUDE_FROM_MASSSTORAGE_C)\r
@@ -154,4 +143,6 @@
                        static void ReturnCommandStatus(void);\r
                #endif\r
 \r
+               uint8_t StreamCallback_AbortOnMassStoreReset(void);\r
+\r
 #endif\r