Changeset 62958 in vbox

Timestamp:

Aug 4, 2016 7:54:03 AM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings

Location:

trunk/src/VBox/Devices/USB

Files:

• DrvVUSBRootHub.cpp (modified) (8 diffs)
• VUSBBufferedPipe.cpp (modified) (3 diffs)

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

@@ -287 +287 @@
 static DECLCALLBACK(int) vusbPDMHubDetachDevice(PPDMDRVINS pDrvIns, PPDMUSBINS pUsbIns, uint32_t iPort)
 {
+    RT_NOREF(pDrvIns, iPort);
     PVUSBDEV pDev = (PVUSBDEV)pUsbIns->pvVUsbDev2;
     Assert(pDev);
@@ -392 +393 @@
                              VUSBDIRECTION enmDir, uint32_t cbData, uint32_t cTds, const char *pszTag)
 {
+    RT_NOREF(pszTag);
     PVUSBURBPOOL pUrbPool = &pRh->Hub.Dev.UrbPool;
 
@@ -564 +566 @@
 static DECLCALLBACK(int) vusbRhR3PeriodFrameWorker(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
 {
+    RT_NOREF(pDrvIns);
     int rc = VINF_SUCCESS;
     PVUSBROOTHUB pThis = (PVUSBROOTHUB)pThread->pvUser;
@@ -619 +622 @@
 static DECLCALLBACK(int) vusbRhR3PeriodFrameWorkerWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
 {
+    RT_NOREF(pThread);
     PVUSBROOTHUB pThis = PDMINS_2_DATA(pDrvIns, PVUSBROOTHUB);
     return RTSemEventMultiSignal(pThis->hSemEventPeriodFrame);
@@ -648 +652 @@
 static DECLCALLBACK(int) vusbRhConnFreeUrb(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBURB pUrb)
 {
-    PVUSBROOTHUB pRh = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
-
+    RT_NOREF(pInterface);
     pUrb->pVUsb->pfnFree(pUrb);
     return VINF_SUCCESS;
@@ -768 +771 @@
 static DECLCALLBACK(void) vusbRhReapAsyncUrbs(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBIDEVICE pDevice, RTMSINTERVAL cMillies)
 {
-    PVUSBROOTHUB pRh = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
+    PVUSBROOTHUB pRh = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface); NOREF(pRh);
     PVUSBDEV pDev = (PVUSBDEV)pDevice;
 
@@ -994 +997 @@
  * @interface_method_impl{VUSBIDEVICE,pfnReset}
  */
-static DECLCALLBACK(int) vusbRhDevReset(PVUSBIDEVICE pInterface, bool fResetOnLinux, PFNVUSBRESETDONE pfnDone, void *pvUser, PVM pVM)
-{
+static DECLCALLBACK(int) vusbRhDevReset(PVUSBIDEVICE pInterface, bool fResetOnLinux,
+                                        PFNVUSBRESETDONE pfnDone, void *pvUser, PVM pVM)
+{
+    RT_NOREF(pfnDone, pvUser, pVM);
     PVUSBROOTHUB pRh = RT_FROM_MEMBER(pInterface, VUSBROOTHUB, Hub.Dev.IDevice);
     Assert(!pfnDone);
@@ -1223 +1228 @@
 static DECLCALLBACK(int) vusbRhConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
+    RT_NOREF(fFlags);
+    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
     LogFlow(("vusbRhConstruct: Instance %d\n", pDrvIns->iInstance));
     PVUSBROOTHUB pThis = PDMINS_2_DATA(pDrvIns, PVUSBROOTHUB);
-    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
 
     /*

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

@@ -284 +284 @@
 static int vusbBufferedPipeSetParamsFromDescriptor(PVUSBBUFFEREDPIPEINT pThis, PCVUSBDESCENDPOINT pDesc)
 {
-    int rc = VINF_SUCCESS;
-    unsigned cbPktMax, uInterval, uMult;
+    unsigned cbPktMax;
+    unsigned uInterval;
+    unsigned uMult;
 
     if (pThis->enmSpeed == VUSB_SPEED_HIGH)
@@ -308 +309 @@
         /** @todo: Implement for super speed and up if it turns out to be required, at the moment it looks
          * like we don't need it. */
-        rc = VERR_NOT_SUPPORTED;
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        pThis->uInterval = uInterval;
-        pThis->cbPktSize = cbPktMax * uMult;
-        pThis->uEndPt    = pDesc->bEndpointAddress & 0xf;
-
-        unsigned cPackets = pThis->cLatencyMs / pThis->uInterval;
-        cPackets = RT_MAX(cPackets, 1); /* At least one packet. */
-        pThis->cbRingBufData = pThis->cbPktSize * cPackets;
-        pThis->cIsocDesc     = cPackets / 8 + ((cPackets % 8) ? 1 : 0);
-    }
-
-    return rc;
+        return VERR_NOT_SUPPORTED;
+    }
+
+    pThis->uInterval = uInterval;
+    pThis->cbPktSize = cbPktMax * uMult;
+    pThis->uEndPt    = pDesc->bEndpointAddress & 0xf;
+
+    unsigned cPackets = pThis->cLatencyMs / pThis->uInterval;
+    cPackets = RT_MAX(cPackets, 1); /* At least one packet. */
+    pThis->cbRingBufData = pThis->cbPktSize * cPackets;
+    pThis->cIsocDesc     = cPackets / 8 + ((cPackets % 8) ? 1 : 0);
+
+    return VINF_SUCCESS;
 }
 
@@ -410 +408 @@
             {
                 pIsocDesc->aIsocPkts[pIsocDesc->cIsocPkts].enmStatus = VUSBSTATUS_NOT_ACCESSED;
-                pIsocDesc->aIsocPkts[pIsocDesc->cIsocPkts].off = pIsocDesc->cbTotal;
+                pIsocDesc->aIsocPkts[pIsocDesc->cIsocPkts].off = (uint16_t)pIsocDesc->cbTotal;
+                Assert(pIsocDesc->aIsocPkts[pIsocDesc->cIsocPkts].off == pIsocDesc->cbTotal);
                 pIsocDesc->aIsocPkts[pIsocDesc->cIsocPkts].cb  = pUrb->aIsocPkts[i].cb;
                 pIsocDesc->cbTotal += pUrb->aIsocPkts[i].cb;