X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f1199200e167a737a4676378da184387e543830c..fa8beef82d1340a69390d4b11ca785ee016789c5:/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h

diff --git a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h
index 6e1e5cd9e..02aabaf58 100644
--- a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Header file for MassStoreHost.c.
+ *  Header file for MassStorage.c.
  */
- 
-#ifndef _MASS_STORE_HOST_H_
-#define _MASS_STORE_HOST_H_
+
+#ifndef _MASS_STORAGE_HOST_H_
+#define _MASS_STORAGE_HOST_H_
 
 	/* Includes: */
 		#include <avr/io.h>
@@ -42,44 +42,37 @@
 		#include <avr/pgmspace.h>
 		#include <avr/power.h>
 		#include <stdio.h>
-		#include <ctype.h>
 
-		#include "ConfigDescriptor.h"
+		#include <LUFA/Version.h>
+		#include <LUFA/Drivers/Misc/TerminalCodes.h>
+		#include <LUFA/Drivers/Peripheral/SerialStream.h>
+		#include <LUFA/Drivers/Board/LEDs.h>
+		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/USB/Class/MassStorage.h>
+		
+	/* Macros: */
+		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
+		#define LEDMASK_USB_NOTREADY      LEDS_LED1
 
-		#include "Lib/MassStoreCommands.h"
+		/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
+		#define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)
 
-		#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/Peripheral/SerialStream.h>        // Serial stream driver
-		#include <LUFA/Drivers/Board/LEDs.h>                     // LEDs driver
-		#include <LUFA/Drivers/Board/Buttons.h>                  // Board Buttons driver
-		#include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management
+		/** LED mask for the library LED driver, to indicate that the USB interface is ready. */
+		#define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)
 
-	/* Enums: */
-		/** Enum for the possible status codes for passing to the UpdateStatus() function. */
-		enum MassStorageHost_StatusCodes_t
-		{
-			Status_USBNotReady      = 0, /**< USB is not ready (disconnected from a USB device) */
-			Status_USBEnumerating   = 1, /**< USB interface is enumerating */
-			Status_USBReady         = 2, /**< USB interface is connected and ready */
-			Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */
-			Status_HardwareError    = 4, /**< Hardware error while enumerating the attached USB device */
-			Status_Busy             = 5, /**< Busy reading or writing to the attached Mass Storage device */
-			Status_SCSICommandError = 6, /**< Error sending or receiving a command to or from the attached SCSI device */
-		};
+		/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
+		#define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)
+		
+		/** LED mask for the library LED driver, to indicate that the USB interface is busy. */
+		#define LEDMASK_USB_BUSY         (LEDS_LED2)
 
-	/* Task Definitions: */
-		TASK(USB_MassStore_Host);
-				
 	/* Function Prototypes: */
-		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);		
-
+		void SetupHardware(void);
+	
+		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
+		void EVENT_USB_Host_DeviceAttached(void);
+		void EVENT_USB_Host_DeviceUnattached(void);
+		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
+		void EVENT_USB_Host_DeviceEnumerationComplete(void);
+		
 #endif