Changeset 58165 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Oct 9, 2015 9:46:40 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103273

Message:

USB/Darwin: Attempt to fix high-speed isochronous transfers.

File:

• trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp

@@ -162 +162 @@
     /** The endpoint interval. (interrupt) */
     uint8_t                 u8Interval;
+    /** Full-speed device indicator (isochronous pipes only). */
+    bool                    fIsFullSpeed;
     /** The max packet size. */
     uint16_t                u16MaxPacketSize;
@@ -732 +734 @@
      */
     int rc = VINF_SUCCESS;
+    bool fFullSpeed;
+    UInt32 u32UsecInFrame;
     UInt8 cPipes;
     IOReturn irc = (*pIf->ppIfI)->GetNumEndpoints(pIf->ppIfI, &cPipes);
@@ -746 +750 @@
     pIf->cPipes = cPipes + 1;
 
+    /* Find out if this is a full-speed interface (needed for isochronous support). */
+    irc = (*pIf->ppIfI)->GetFrameListTime(pIf->ppIfI, &u32UsecInFrame);
+    if (irc != kIOReturnSuccess)
+    {
+        pIf->cPipes = 0;
+        if (irc == kIOReturnNoDevice)
+            rc = VERR_VUSB_DEVICE_NOT_ATTACHED;
+        else
+            rc = RTErrConvertFromDarwin(irc);
+        return rc;
+    }
+    fFullSpeed = u32UsecInFrame == kUSBFullSpeedMicrosecondsInFrame;
+
     /*
      * Get the properties of each pipe.
@@ -752 +769 @@
     {
         pIf->aPipes[i].u8PipeRef = i;
+        pIf->aPipes[i].fIsFullSpeed = fFullSpeed;
         pIf->aPipes[i].u64NextFrameNo = 0;
         irc = (*pIf->ppIfI)->GetPipeProperties(pIf->ppIfI, i,
@@ -1742 +1760 @@
                          pUrb->pszDesc, pPipe->u64NextFrameNo, FrameNo, pUrb->cIsocPkts, j, u8PipeRef));
                     if (irc == kIOReturnSuccess)
-                        pPipe->u64NextFrameNo = FrameNo + pUrb->cIsocPkts;
+                    {
+                        if (pPipe->fIsFullSpeed)
+                            pPipe->u64NextFrameNo = FrameNo + pUrb->cIsocPkts;
+                        else
+                            pPipe->u64NextFrameNo = FrameNo + 1;
+                    }
                     break;
                 }