Fixed compilation error in incomplete BluetoothHost demo.

[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 5dbc4a2..0a6604c 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
@@ -64,7 +72,7 @@ int main(void)
 \r
        for (;;)\r
        {\r
-               USB_MS_USBTask(&Disk_MS_Interface);\r
+               MS_Device_USBTask(&Disk_MS_Interface);\r
                USB_USBTask();\r
        }\r
 }\r
@@ -105,21 +113,21 @@ void EVENT_USB_ConfigurationChanged(void)
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r
-       if (!(USB_MS_ConfigureEndpoints(&Disk_MS_Interface)))\r
+       if (!(MS_Device_ConfigureEndpoints(&Disk_MS_Interface)))\r
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r
 /** Event handler for the library USB Unhandled Control Packet event. */\r
 void EVENT_USB_UnhandledControlPacket(void)\r
 {\r
-       USB_MS_ProcessControlPacket(&Disk_MS_Interface);\r
+       MS_Device_ProcessControlPacket(&Disk_MS_Interface);\r
 }\r
 \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_USB_MS_SCSICommandReceived(USB_ClassInfo_MS_t* MSInterfaceInfo)\r
+bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
 {\r
        bool CommandSuccess;\r
        \r