Add new Incomplete device subdirectory for work-in-progress demos. Add incomplete...

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

diff --git a/Demos/Host/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h
index 73a69c0..6e1e5cd 100644 (file)
--- a/Demos/Host/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/MassStorageHost/MassStorageHost.h
@@ -45,14 +45,15 @@
                #include <ctype.h>\r
 \r
                #include "ConfigDescriptor.h"\r
-               #include "MassStoreCommands.h"\r
+\r
+               #include "Lib/MassStoreCommands.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/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/Drivers/Board/HWB.h>                      // Hardware Button driver\r
+               #include <LUFA/Drivers/Board/Buttons.h>                  // Board Buttons driver\r
                #include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management\r
 \r
        /* Enums: */\r
@@ -70,16 +71,15 @@
 \r
        /* Task Definitions: */\r
                TASK(USB_MassStore_Host);\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 ShowDiskReadError(char* CommandString, uint8_t ErrorCode);\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 ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode);\r
                void UpdateStatus(uint8_t CurrentStatus);               \r
 \r
 #endif\r