Break device mode class driver interfaces into seperate config and state structs...

[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..87da975 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.c
+++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.c
@@ -40,17 +40,25 @@
  *  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
-\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
-\r
-               .TotalLUNs              = TOTAL_LUNS,\r
+               .Config =\r
+                       {\r
+                               .InterfaceNumber        = 0,\r
+\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
+\r
+                               .TotalLUNs              = TOTAL_LUNS,\r
+                       },\r
+               \r
+               .State =\r
+                       {\r
+                               // Leave all state values to their defaults\r
+                       }\r
        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
@@ -119,7 +127,7 @@ void EVENT_USB_UnhandledControlPacket(void)
  *\r
  *  \param 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