Remove serial driver use from the AVRISP project now that it is no longer needed.

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

diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.h b/Demos/Device/ClassDriver/MassStorage/MassStorage.h
index afc67df..5fb37f1 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.h
+++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.h
@@ -47,11 +47,9 @@
                #include "Lib/DataflashManager.h"\r
 \r
                #include <LUFA/Version.h>\r
-               #include <LUFA/Drivers/Board/Joystick.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
-               #include <LUFA/Drivers/Board/Buttons.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/MassStorage.h>
+               #include <LUFA/Drivers/USB/Class/MassStorage.h>
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
@@ -67,10 +65,10 @@
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r
-               #define LEDMASK_USB_BUSY         (LEDS_LED2)\r
+               #define LEDMASK_USB_BUSY          LEDS_LED2\r
                \r
                /** Total number of logical drives within the device - must be non-zero. */\r
-               #define TOTAL_LUNS                2\r
+               #define TOTAL_LUNS                1\r
                \r
                /** Blocks in each LUN, calculated from the total capacity divided by the total number of Logical Units in the device. */\r
                #define LUN_MEDIA_BLOCKS         (VIRTUAL_MEMORY_BLOCKS / TOTAL_LUNS)\r
@@ -78,11 +76,11 @@
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
 \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
+               void EVENT_USB_Device_Connect(void);\r
+               void EVENT_USB_Device_Disconnect(void);\r
+               void EVENT_USB_Device_ConfigurationChanged(void);\r
+               void EVENT_USB_Device_UnhandledControlRequest(void);\r
 \r
-               bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_t* MSInterfaceInfo);\r
+               bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
 \r
 #endif\r