Changeset 60486 in vbox

Timestamp:

Apr 14, 2016 9:57:02 AM (9 years ago)

Author:

vboxsync

Message:

VBoxUSB.sys: We will never see TRANSFER_TYPE_CTRL (only MSG).

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp

@@ -1076 +1076 @@
         switch(pContext->ulTransferType)
         {
-            case USBSUP_TRANSFER_TYPE_CTRL:
             case USBSUP_TRANSFER_TYPE_MSG:
                 pUrbInfo->len = pUrb->UrbControlTransfer.TransferBufferLength;
@@ -1118 +1117 @@
         switch(pContext->ulTransferType)
         {
-            case USBSUP_TRANSFER_TYPE_CTRL:
             case USBSUP_TRANSFER_TYPE_MSG:
-                LogRel(("Ctrl/Msg length=%d\n", pUrb->UrbControlTransfer.TransferBufferLength));
+                LogRel(("Msg (CTRL) length=%d\n", pUrb->UrbControlTransfer.TransferBufferLength));
                 break;
             case USBSUP_TRANSFER_TYPE_ISOC:
@@ -1272 +1270 @@
         switch (pUrbInfo->type)
         {
-            case USBSUP_TRANSFER_TYPE_CTRL:
             case USBSUP_TRANSFER_TYPE_MSG:
             {
@@ -1285 +1282 @@
                     pUrb->UrbControlTransfer.TransferFlags |= USBD_DEFAULT_PIPE_TRANSFER;
 
-                if (pUrbInfo->type == USBSUP_TRANSFER_TYPE_MSG)
-                {
-                   /* QUSB_TRANSFER_TYPE_MSG is a control transfer, but it is special
-                    * the first 8 bytes of the buffer is the setup packet so the real
-                    * data length is therefore pUrb->len - 8
-                    */
-                    PVBOXUSB_SETUP pSetup = (PVBOXUSB_SETUP)pUrb->UrbControlTransfer.SetupPacket;
-                    memcpy(pUrb->UrbControlTransfer.SetupPacket, pBuffer, min(sizeof (pUrb->UrbControlTransfer.SetupPacket), pUrbInfo->len));
-
-                    if (pUrb->UrbControlTransfer.TransferBufferLength <= sizeof (pUrb->UrbControlTransfer.SetupPacket))
-                        pUrb->UrbControlTransfer.TransferBufferLength = 0;
-                    else
-                        pUrb->UrbControlTransfer.TransferBufferLength -= sizeof (pUrb->UrbControlTransfer.SetupPacket);
-
-                    pUrb->UrbControlTransfer.TransferBuffer = (uint8_t *)pBuffer + sizeof(pUrb->UrbControlTransfer.SetupPacket);
-                    pUrb->UrbControlTransfer.TransferBufferMDL = 0;
-                    pUrb->UrbControlTransfer.TransferFlags |= USBD_SHORT_TRANSFER_OK;
-                }
+                /* QUSB_TRANSFER_TYPE_MSG is a control transfer, but it is special
+                 * the first 8 bytes of the buffer is the setup packet so the real
+                 * data length is therefore pUrb->len - 8
+                 */
+                PVBOXUSB_SETUP pSetup = (PVBOXUSB_SETUP)pUrb->UrbControlTransfer.SetupPacket;
+                memcpy(pUrb->UrbControlTransfer.SetupPacket, pBuffer, min(sizeof (pUrb->UrbControlTransfer.SetupPacket), pUrbInfo->len));
+
+                if (pUrb->UrbControlTransfer.TransferBufferLength <= sizeof (pUrb->UrbControlTransfer.SetupPacket))
+                    pUrb->UrbControlTransfer.TransferBufferLength = 0;
                 else
-                {
-                    pUrb->UrbControlTransfer.TransferBuffer = 0;
-                    pUrb->UrbControlTransfer.TransferBufferMDL = pMdlBuf;
-                }
+                    pUrb->UrbControlTransfer.TransferBufferLength -= sizeof (pUrb->UrbControlTransfer.SetupPacket);
+
+                pUrb->UrbControlTransfer.TransferBuffer = (uint8_t *)pBuffer + sizeof(pUrb->UrbControlTransfer.SetupPacket);
+                pUrb->UrbControlTransfer.TransferBufferMDL = 0;
+                pUrb->UrbControlTransfer.TransferFlags |= USBD_SHORT_TRANSFER_OK;
                 break;
             }