Fixed incorrect PID value being used in the USBtoSerial project (thanks to Phill).

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

diff --git a/Demos/Device/MassStorage/MassStorage.h b/Demos/Device/MassStorage/MassStorage.h
index a30e7f7..afe9872 100644 (file)
--- a/Demos/Device/MassStorage/MassStorage.h
+++ b/Demos/Device/MassStorage/MassStorage.h
@@ -46,7 +46,6 @@
                #include "DataflashManager.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/LEDs.h>         // LEDs driver\r
                #include <LUFA/Drivers/Board/Dataflash.h>    // Dataflash chip driver\r
@@ -131,26 +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_Reset event when thrown by the library. */\r
-               HANDLES_EVENT(USB_Reset);\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_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
@@ -158,4 +143,6 @@
                        static void ReturnCommandStatus(void);\r
                #endif\r
 \r
+               uint8_t StreamCallback_AbortOnMassStoreReset(void);\r
+\r
 #endif\r