Fix NVM commands so that memory reads and CRC generations now work correctly using...

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

diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.h b/Demos/Device/LowLevel/MassStorage/MassStorage.h
index 81fba00..05dbe75 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.h
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.h
@@ -64,7 +64,7 @@
                /** Total number of Logical Units (drives) in the device. The total device capacity is shared equally between\r
                 *  each drive - this can be set to any positive non-zero amount.\r
                 */\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
@@ -94,7 +94,7 @@
                #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
        /* Type defines: */\r
                /** Type define for a Command Block Wrapper, used in the Mass Storage Bulk-Only Transport protocol. */\r
@@ -136,10 +136,10 @@
                void SetupHardware(void);\r
                void MassStorage_Task(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
                #if defined(INCLUDE_FROM_MASSSTORAGE_C)\r
                        static bool ReadInCommandBlock(void);\r