projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Oops - with new changes to the way the device Configuration Descriptor is retrieved...
[pub/USBasp.git] / LUFA / Drivers / USB / Class / Device / MassStorage.c
diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.c b/LUFA/Drivers/USB/Class/Device/MassStorage.c
index 1c41f60..04c63fc 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Device/MassStorage.c
@@ -28,17 +28,20 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r
-#define  INCLUDE_FROM_MS_CLASS_C\r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r
+#define  INCLUDE_FROM_MS_CLASS_DEVICE_C\r
 #include "MassStorage.h"\r
 \r
 #include "MassStorage.h"\r
 \r
-static USB_ClassInfo_MS_t* CallbackMSInterfaceInfo;\r
+static USB_ClassInfo_MS_Device_t* CallbackMSInterfaceInfo;\r
 \r
 \r
-void USB_MS_ProcessControlPacket(USB_ClassInfo_MS_t* MSInterfaceInfo)\r
+void MS_Device_ProcessControlRequest(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)\r
 {\r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r
          \r
 {\r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r
          \r
-       if (USB_ControlRequest.wIndex != MSInterfaceInfo->InterfaceNumber)\r
+       if (USB_ControlRequest.wIndex != MSInterfaceInfo->Config.InterfaceNumber)\r
          return;\r
 \r
        switch (USB_ControlRequest.bRequest)\r
          return;\r
 \r
        switch (USB_ControlRequest.bRequest)\r
@@ -48,10 +51,9 @@ void USB_MS_ProcessControlPacket(USB_ClassInfo_MS_t* MSInterfaceInfo)
                        {\r
                                Endpoint_ClearSETUP();\r
 \r
                        {\r
                                Endpoint_ClearSETUP();\r
 \r
-                               MSInterfaceInfo->IsMassStoreReset = true;                       \r
+                               MSInterfaceInfo->State.IsMassStoreReset = true;                 \r
 \r
 \r
-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                               Endpoint_ClearStatusStage();\r
                        }\r
 \r
                        break;\r
                        }\r
 \r
                        break;\r
@@ -60,29 +62,29 @@ void USB_MS_ProcessControlPacket(USB_ClassInfo_MS_t* MSInterfaceInfo)
                        {\r
                                Endpoint_ClearSETUP();\r
 \r
                        {\r
                                Endpoint_ClearSETUP();\r
 \r
-                               Endpoint_Write_Byte(MSInterfaceInfo->TotalLUNs - 1);\r
-                               \r
+                               Endpoint_Write_Byte(MSInterfaceInfo->Config.TotalLUNs - 1);                             \r
                                Endpoint_ClearIN();\r
                                \r
                                Endpoint_ClearIN();\r
                                \r
-                               while (!(Endpoint_IsOUTReceived()));\r
-                               Endpoint_ClearOUT();\r
+                               Endpoint_ClearStatusStage();\r
                        }\r
                        \r
                        break;\r
        }\r
 }\r
 \r
                        }\r
                        \r
                        break;\r
        }\r
 }\r
 \r
-bool USB_MS_ConfigureEndpoints(USB_ClassInfo_MS_t* MSInterfaceInfo)\r
+bool MS_Device_ConfigureEndpoints(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)\r
 {\r
 {\r
-       if (!(Endpoint_ConfigureEndpoint(MSInterfaceInfo->DataINEndpointNumber, EP_TYPE_BULK,\r
-                                                                ENDPOINT_DIR_IN, MSInterfaceInfo->DataINEndpointSize,\r
+       memset(&MSInterfaceInfo->State, 0x00, sizeof(MSInterfaceInfo->State));\r
+\r
+       if (!(Endpoint_ConfigureEndpoint(MSInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_BULK,\r
+                                                                ENDPOINT_DIR_IN, MSInterfaceInfo->Config.DataINEndpointSize,\r
                                                                 ENDPOINT_BANK_SINGLE)))\r
        {\r
                return false;\r
        }\r
 \r
                                                                 ENDPOINT_BANK_SINGLE)))\r
        {\r
                return false;\r
        }\r
 \r
-       if (!(Endpoint_ConfigureEndpoint(MSInterfaceInfo->DataOUTEndpointNumber, EP_TYPE_BULK,\r
-                                        ENDPOINT_DIR_OUT, MSInterfaceInfo->DataOUTEndpointSize,\r
+       if (!(Endpoint_ConfigureEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber, EP_TYPE_BULK,\r
+                                        ENDPOINT_DIR_OUT, MSInterfaceInfo->Config.DataOUTEndpointSize,\r
                                         ENDPOINT_BANK_SINGLE)))\r
        {\r
                return false;\r
                                         ENDPOINT_BANK_SINGLE)))\r
        {\r
                return false;\r
@@ -91,118 +93,125 @@ bool USB_MS_ConfigureEndpoints(USB_ClassInfo_MS_t* MSInterfaceInfo)
        return true;\r
 }\r
 \r
        return true;\r
 }\r
 \r
-void USB_MS_USBTask(USB_ClassInfo_MS_t* MSInterfaceInfo)\r
+void MS_Device_USBTask(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)\r
 {\r
 {\r
-       if (!(USB_IsConnected))\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
          return;\r
 \r
          return;\r
 \r
-       Endpoint_SelectEndpoint(MSInterfaceInfo->DataOUTEndpointNumber);\r
+       Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber);\r
                \r
        if (Endpoint_IsReadWriteAllowed())\r
        {\r
                \r
        if (Endpoint_IsReadWriteAllowed())\r
        {\r
-               if (USB_MS_ReadInCommandBlock(MSInterfaceInfo))\r
+               if (MS_Device_ReadInCommandBlock(MSInterfaceInfo))\r
                {\r
                {\r
-                       if (MSInterfaceInfo->CommandBlock.Flags & COMMAND_DIRECTION_DATA_IN)\r
-                         Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);\r
+                       if (MSInterfaceInfo->State.CommandBlock.Flags & MS_COMMAND_DIR_DATA_IN)\r
+                         Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpointNumber);\r
                          \r
                          \r
-                       MSInterfaceInfo->CommandStatus.Status              = CALLBACK_USB_MS_SCSICommandReceived(MSInterfaceInfo) ?\r
-                                                                             Command_Pass : Command_Fail;\r
-                       MSInterfaceInfo->CommandStatus.Signature           = CSW_SIGNATURE;\r
-                       MSInterfaceInfo->CommandStatus.Tag                 = MSInterfaceInfo->CommandBlock.Tag;\r
-                       MSInterfaceInfo->CommandStatus.DataTransferResidue = MSInterfaceInfo->CommandBlock.DataTransferLength;\r
-\r
-                       if ((MSInterfaceInfo->CommandStatus.Status == Command_Fail) && (MSInterfaceInfo->CommandStatus.DataTransferResidue))\r
-                         Endpoint_StallTransaction();\r
+                       MSInterfaceInfo->State.CommandStatus.Status = CALLBACK_MS_Device_SCSICommandReceived(MSInterfaceInfo) ?\r
+                                                                                        SCSI_Command_Pass : SCSI_Command_Fail;\r
+                       MSInterfaceInfo->State.CommandStatus.Signature           = MS_CSW_SIGNATURE;\r
+                       MSInterfaceInfo->State.CommandStatus.Tag                 = MSInterfaceInfo->State.CommandBlock.Tag;\r
+                       MSInterfaceInfo->State.CommandStatus.DataTransferResidue = MSInterfaceInfo->State.CommandBlock.DataTransferLength;\r
+\r
+                       if ((MSInterfaceInfo->State.CommandStatus.Status == SCSI_Command_Fail) &&\r
+                           (MSInterfaceInfo->State.CommandStatus.DataTransferResidue))\r
+                       {\r
+                               Endpoint_StallTransaction();\r
+                       }\r
                        \r
                        \r
-                       USB_MS_ReturnCommandStatus(MSInterfaceInfo);\r
+                       MS_Device_ReturnCommandStatus(MSInterfaceInfo);\r
                        \r
                        \r
-                       if (MSInterfaceInfo->IsMassStoreReset)\r
+                       if (MSInterfaceInfo->State.IsMassStoreReset)\r
                        {\r
                        {\r
-                               Endpoint_ResetFIFO(MSInterfaceInfo->DataOUTEndpointNumber);\r
-                               Endpoint_ResetFIFO(MSInterfaceInfo->DataINEndpointNumber);\r
+                               Endpoint_ResetFIFO(MSInterfaceInfo->Config.DataOUTEndpointNumber);\r
+                               Endpoint_ResetFIFO(MSInterfaceInfo->Config.DataINEndpointNumber);\r
                                \r
                                \r
-                               Endpoint_SelectEndpoint(MSInterfaceInfo->DataOUTEndpointNumber);\r
+                               Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber);\r
                                Endpoint_ClearStall();\r
                                Endpoint_ClearStall();\r
-                               Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);\r
+                               Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpointNumber);\r
                                Endpoint_ClearStall();\r
                                Endpoint_ClearStall();\r
-\r
-                               MSInterfaceInfo->IsMassStoreReset = false;\r
                        }\r
                }\r
        }\r
                        }\r
                }\r
        }\r
+       \r
+       MSInterfaceInfo->State.IsMassStoreReset = false;\r
 }\r
 \r
 }\r
 \r
-static bool USB_MS_ReadInCommandBlock(USB_ClassInfo_MS_t* MSInterfaceInfo)\r
+static bool MS_Device_ReadInCommandBlock(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)\r
 {\r
 {\r
-       Endpoint_SelectEndpoint(MSInterfaceInfo->DataOUTEndpointNumber);\r
+       Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber);\r
 \r
        CallbackMSInterfaceInfo = MSInterfaceInfo;\r
 \r
        CallbackMSInterfaceInfo = MSInterfaceInfo;\r
-       Endpoint_Read_Stream_LE(&MSInterfaceInfo->CommandBlock,\r
-                               (sizeof(CommandBlockWrapper_t) - MAX_SCSI_COMMAND_LENGTH),\r
-                               StreamCallback_AbortOnMassStoreReset);\r
-\r
-       if ((MSInterfaceInfo->CommandBlock.Signature         != CBW_SIGNATURE)              ||\r
-           (MSInterfaceInfo->CommandBlock.LUN               >= MSInterfaceInfo->TotalLUNs) ||\r
-               (MSInterfaceInfo->CommandBlock.SCSICommandLength >  MAX_SCSI_COMMAND_LENGTH))\r
+       Endpoint_Read_Stream_LE(&MSInterfaceInfo->State.CommandBlock,\r
+                               (sizeof(MS_CommandBlockWrapper_t) - 16),\r
+                               StreamCallback_MS_Device_AbortOnMassStoreReset);\r
+\r
+       if ((MSInterfaceInfo->State.CommandBlock.Signature         != MS_CBW_SIGNATURE)                  ||\r
+           (MSInterfaceInfo->State.CommandBlock.LUN               >= MSInterfaceInfo->Config.TotalLUNs) ||\r
+               (MSInterfaceInfo->State.CommandBlock.Flags              & 0x1F)                              ||\r
+               (MSInterfaceInfo->State.CommandBlock.SCSICommandLength == 0)                                 ||\r
+               (MSInterfaceInfo->State.CommandBlock.SCSICommandLength >  16))\r
        {\r
                Endpoint_StallTransaction();\r
        {\r
                Endpoint_StallTransaction();\r
-               Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);\r
+               Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpointNumber);\r
                Endpoint_StallTransaction();\r
                \r
                return false;\r
        }\r
 \r
        CallbackMSInterfaceInfo = MSInterfaceInfo;\r
                Endpoint_StallTransaction();\r
                \r
                return false;\r
        }\r
 \r
        CallbackMSInterfaceInfo = MSInterfaceInfo;\r
-       Endpoint_Read_Stream_LE(&MSInterfaceInfo->CommandBlock.SCSICommandData,\r
-                               MSInterfaceInfo->CommandBlock.SCSICommandLength,\r
-                               StreamCallback_AbortOnMassStoreReset);\r
+       Endpoint_Read_Stream_LE(&MSInterfaceInfo->State.CommandBlock.SCSICommandData,\r
+                               MSInterfaceInfo->State.CommandBlock.SCSICommandLength,\r
+                               StreamCallback_MS_Device_AbortOnMassStoreReset);\r
                                                        \r
        Endpoint_ClearOUT();\r
          \r
                                                        \r
        Endpoint_ClearOUT();\r
          \r
-       if (MSInterfaceInfo->IsMassStoreReset)\r
+       if (MSInterfaceInfo->State.IsMassStoreReset)\r
          return false;\r
 \r
        return true;\r
 }\r
 \r
          return false;\r
 \r
        return true;\r
 }\r
 \r
-static void USB_MS_ReturnCommandStatus(USB_ClassInfo_MS_t* MSInterfaceInfo)\r
+static void MS_Device_ReturnCommandStatus(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)\r
 {\r
 {\r
-       Endpoint_SelectEndpoint(MSInterfaceInfo->DataOUTEndpointNumber);\r
+       Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber);\r
 \r
        while (Endpoint_IsStalled())\r
        {\r
                USB_USBTask();\r
 \r
 \r
        while (Endpoint_IsStalled())\r
        {\r
                USB_USBTask();\r
 \r
-               if (MSInterfaceInfo->IsMassStoreReset)\r
+               if (MSInterfaceInfo->State.IsMassStoreReset)\r
                  return;\r
        }\r
 \r
                  return;\r
        }\r
 \r
-       Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);\r
+       Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpointNumber);\r
 \r
        while (Endpoint_IsStalled())\r
        {\r
                USB_USBTask();\r
 \r
 \r
        while (Endpoint_IsStalled())\r
        {\r
                USB_USBTask();\r
 \r
-               if (MSInterfaceInfo->IsMassStoreReset)\r
+               if (MSInterfaceInfo->State.IsMassStoreReset)\r
                  return;\r
        }\r
        \r
        CallbackMSInterfaceInfo = MSInterfaceInfo;\r
                  return;\r
        }\r
        \r
        CallbackMSInterfaceInfo = MSInterfaceInfo;\r
-       Endpoint_Write_Stream_LE(&MSInterfaceInfo->CommandStatus, sizeof(CommandStatusWrapper_t),\r
-                                StreamCallback_AbortOnMassStoreReset);\r
+       Endpoint_Write_Stream_LE(&MSInterfaceInfo->State.CommandStatus, sizeof(MS_CommandStatusWrapper_t),\r
+                                StreamCallback_MS_Device_AbortOnMassStoreReset);\r
        \r
        Endpoint_ClearIN();\r
 \r
        \r
        Endpoint_ClearIN();\r
 \r
-       if (MSInterfaceInfo->IsMassStoreReset)\r
+       if (MSInterfaceInfo->State.IsMassStoreReset)\r
          return;\r
 }\r
 \r
          return;\r
 }\r
 \r
-static uint8_t StreamCallback_AbortOnMassStoreReset(void)\r
+static uint8_t StreamCallback_MS_Device_AbortOnMassStoreReset(void)\r
 {\r
 {\r
-       USB_MS_USBTask(CallbackMSInterfaceInfo);\r
+       MS_Device_USBTask(CallbackMSInterfaceInfo);\r
 \r
 \r
-       if (CallbackMSInterfaceInfo->IsMassStoreReset)\r
+       if (CallbackMSInterfaceInfo->State.IsMassStoreReset)\r
          return STREAMCALLBACK_Abort;\r
        else\r
          return STREAMCALLBACK_Continue;\r
 }\r
          return STREAMCALLBACK_Abort;\r
        else\r
          return STREAMCALLBACK_Continue;\r
 }\r
+\r
+#endif\r
USB isp AVR programmer