儲存庫 vbox 的更動 67589

時間撮記:

2017-6-23 下午04:39:57 (7 年 以前)

作者:

vboxsync

訊息:

Undoing bad commit.

位置:

trunk/src/VBox/Devices/USB

檔案:

• DrvVUSBRootHub.cpp (修改) (3 筆差異)
• VUSBInternal.h (修改) (1 筆差異)

trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp

@@ -982 +982 @@
 
 /** @interface_method_impl{VUSBIROOTHUBCONNECTOR,pfnGetPeriodicFrameRate} */
-static DECLCALLBACK(uint32_t) vusbRhGetPeriodicFrameRate(PVUSBIROOTHUBCONNECTOR pInterface)
+static DECLCALLBACK(uint32_t) vusbRhGetPriodicFrameRate(PVUSBIROOTHUBCONNECTOR pInterface)
 {
     PVUSBROOTHUB pThis = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
 
     return pThis->uFrameRate;
-}
-
-/** @interface_method_impl{VUSBIROOTHUBCONNECTOR,pfnGetPeriodicFrameRate} */
-static DECLCALLBACK(uint32_t) vusbRhUpdateIsocFrameDelta(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBIDEVICE pDevice,
-                                                         int EndPt, VUSBDIRECTION enmDir, uint16_t uNewFrame, uint8_t uBits)
-{
-    PVUSBROOTHUB    pRh = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
-    AssertReturn(pRh, 0);
-    PVUSBDEV        pDev = (PVUSBDEV)pDevice;
-    PVUSBPIPE       pPipe = &pDev->aPipes[EndPt];
-    uint32_t        *puLastFrame;
-    int32_t         uFrameDelta;
-    uint32_t        uMaxVal = 1 << uBits;
-
-    puLastFrame  = enmDir == VUSBDIRECTION_IN ? &pPipe->uLastFrameIn : &pPipe->uLastFrameOut;
-    uFrameDelta  = uNewFrame - *puLastFrame;
-    *puLastFrame = uNewFrame;
-    /* Take care of wrap-around. */
-    if (uFrameDelta < 0)
-        uFrameDelta += uMaxVal;
-
-    return (uint16_t)uFrameDelta;
 }
 
@@ -1153 +1131 @@
         pRh->pDevices = pDev;
         RTCritSectLeave(&pRh->CritSectDevices);
-        LogRel(("VUSB: Attached '%s' to port %d on %s (%sSpeed)\n", pDev->pUsbIns->pszName,
+        LogRel(("VUSB: Attached '%s' to port %d on %s (%sSpeed)\n", pDev->pUsbIns->pszName, 
                 iPort, pHub->pszName, vusbGetSpeedString(pDev->pUsbIns->enmSpeed)));
     }
@@ -1345 +1323 @@
     pThis->IRhConnector.pfnDetachDevice               = vusbRhDetachDevice;
     pThis->IRhConnector.pfnSetPeriodicFrameProcessing = vusbRhSetFrameProcessing;
-    pThis->IRhConnector.pfnGetPeriodicFrameRate       = vusbRhGetPeriodicFrameRate;
-    pThis->IRhConnector.pfnUpdateIsocFrameDelta       = vusbRhUpdateIsocFrameDelta;
+    pThis->IRhConnector.pfnGetPeriodicFrameRate       = vusbRhGetPriodicFrameRate;
     pThis->hSniffer                                   = VUSBSNIFFER_NIL;
     pThis->cbHci                                      = 0;

trunk/src/VBox/Devices/USB/VUSBInternal.h

@@ -158 +158 @@
     /** Count of active async transfers. */
     volatile uint32_t   async;
-    /** Last scheduled frame - only valid for isochronous IN endpoints. */
-    uint32_t            uLastFrameIn;
-    /** Last scheduled frame - only valid for isochronous OUT endpoints. */
-    uint32_t            uLastFrameOut;
 } VUSBPIPE;
 /** Pointer to a VUSB pipe structure. */