Removed interrupt disable/enable from the Device mode control request processing...

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

diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.c b/Demos/Device/ClassDriver/MassStorage/MassStorage.c
index 66bba8f..6a4612e 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.c
+++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.c
@@ -40,17 +40,20 @@
  *  passed to all Mass Storage Class driver functions, so that multiple instances of the same class\r
  *  within a device can be differentiated from one another.\r
  */\r
-USB_ClassInfo_MS_t Disk_MS_Interface =\r
+USB_ClassInfo_MS_Device_t Disk_MS_Interface =\r
        {\r
-               .InterfaceNumber        = 0,\r
+               .Config =\r
+                       {\r
+                               .InterfaceNumber        = 0,\r
 \r
-               .DataINEndpointNumber   = MASS_STORAGE_IN_EPNUM,\r
-               .DataINEndpointSize     = MASS_STORAGE_IO_EPSIZE,\r
+                               .DataINEndpointNumber   = MASS_STORAGE_IN_EPNUM,\r
+                               .DataINEndpointSize     = MASS_STORAGE_IO_EPSIZE,\r
 \r
-               .DataOUTEndpointNumber  = MASS_STORAGE_OUT_EPNUM,\r
-               .DataOUTEndpointSize    = MASS_STORAGE_IO_EPSIZE,\r
+                               .DataOUTEndpointNumber  = MASS_STORAGE_OUT_EPNUM,\r
+                               .DataOUTEndpointSize    = MASS_STORAGE_IO_EPSIZE,\r
 \r
-               .TotalLUNs              = TOTAL_LUNS,\r
+                               .TotalLUNs              = TOTAL_LUNS,\r
+                       },\r
        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
@@ -117,9 +120,9 @@ void EVENT_USB_UnhandledControlPacket(void)
 \r
 /** Mass Storage class driver callback function the reception of SCSI commands from the host, which must be processed.\r
  *\r
- *  \param MSInterfaceInfo  Pointer to the Mass Storage class interface configuration structure being referenced\r
+ *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface configuration structure being referenced\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
        bool CommandSuccess;\r
        \r