Use the PDI REPEAT instruction in the PDI programmer code to reduce protocol overhead...

[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..3895555 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.c
+++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.c
@@ -40,17 +40,22 @@
  *  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
+                               .DataINEndpointDoubleBank  = false,\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
+                               .DataOUTEndpointDoubleBank = false,\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
@@ -64,7 +69,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
@@ -81,7 +86,8 @@ void SetupHardware(void)
 \r
        /* Hardware Initialization */\r
        LEDs_Init();\r
-       Dataflash_Init(SPI_SPEED_FCPU_DIV_2);\r
+       SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);\r
+       Dataflash_Init();\r
        USB_Init();\r
 \r
        /* Clear Dataflash sector protections, if enabled */\r
@@ -89,37 +95,37 @@ void SetupHardware(void)
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r
-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r
-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r
-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\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
+/** Event handler for the library USB Unhandled Control Request event. */\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r
 {\r
-       USB_MS_ProcessControlPacket(&Disk_MS_Interface);\r
+       MS_Device_ProcessControlRequest(&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