X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/8f6b4ddf764c3a54e42d00a7502c82c5c3e71b1c..bf041e8bbf67222e1c899b8df96f8220d5a0d9d2:/Demos/Host/MassStorageHost/MassStorageHost.h

diff --git a/Demos/Host/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h
index 73a69c0d8..6e1e5cd9e 100644
--- a/Demos/Host/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/MassStorageHost/MassStorageHost.h
@@ -45,14 +45,15 @@
 		#include <ctype.h>
 
 		#include "ConfigDescriptor.h"
-		#include "MassStoreCommands.h"
+
+		#include "Lib/MassStoreCommands.h"
 
 		#include <LUFA/Version.h>                                // Library Version Information
 		#include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes
 		#include <LUFA/Drivers/USB/USB.h>                        // USB Functionality
-		#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h>       // Serial stream driver
+		#include <LUFA/Drivers/Peripheral/SerialStream.h>        // Serial stream driver
 		#include <LUFA/Drivers/Board/LEDs.h>                     // LEDs driver
-		#include <LUFA/Drivers/Board/HWB.h>                      // Hardware Button driver
+		#include <LUFA/Drivers/Board/Buttons.h>                  // Board Buttons driver
 		#include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management
 
 	/* Enums: */
@@ -70,16 +71,15 @@
 
 	/* Task Definitions: */
 		TASK(USB_MassStore_Host);
-
-	/* Event Handlers: */
-		HANDLES_EVENT(USB_DeviceAttached);
-		HANDLES_EVENT(USB_DeviceUnattached);
-		HANDLES_EVENT(USB_DeviceEnumerationComplete);
-		HANDLES_EVENT(USB_HostError);
-		HANDLES_EVENT(USB_DeviceEnumerationFailed);
 				
 	/* Function Prototypes: */
-		void ShowDiskReadError(char* CommandString, uint8_t ErrorCode);
+		void EVENT_USB_HostError(const uint8_t ErrorCode);
+		void EVENT_USB_DeviceAttached(void);
+		void EVENT_USB_DeviceUnattached(void);
+		void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
+		void EVENT_USB_DeviceEnumerationComplete(void);
+
+		void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode);
 		void UpdateStatus(uint8_t CurrentStatus);		
 
 #endif