儲存庫 vbox 的更動 62955

時間撮記:

2016-8-4 上午07:45:06 (8 年 以前)

作者:

vboxsync

訊息:

Devices: warnings

檔案:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (修改) (21 筆差異)

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

@@ -985 +985 @@
 static DECLCALLBACK(uint32_t) ohciRhGetUSBVersions(PVUSBIROOTHUBPORT pInterface)
 {
+    RT_NOREF(pInterface);
     return VUSB_STDVER_11;
 }
@@ -1035 +1036 @@
 static DECLCALLBACK(void) ohciRhDetach(PVUSBIROOTHUBPORT pInterface, PVUSBIDEVICE pDev, unsigned uPort)
 {
+    RT_NOREF(pDev);
     POHCI pThis = VUSBIROOTHUBPORT_2_OHCI(pInterface);
     LogFlow(("ohciRhDetach: pDev=%p uPort=%u\n", pDev, uPort));
@@ -1586 +1588 @@
               pszLogMsg));
     }
+#else
+    RT_NOREF(pszLogMsg);
 #endif
     ohciPutDWords(pThis, TdAddr, (uint32_t *)pTd, sizeof(*pTd) >> 2);
@@ -1621 +1625 @@
               (ITdOld.aPSW[7] >> 12) != (pITd->aPSW[7] >> 12) ? "*" : "", pITd->aPSW[7] >> 12,  (ITdOld.aPSW[7] & 0xfff) != (pITd->aPSW[7] & 0xfff) ? "*" : "", pITd->aPSW[7] & 0xfff));
     }
+#else
+    RT_NOREF(pszLogMsg);
 #endif
     ohciPutDWords(pThis, ITdAddr, (uint32_t *)pITd, sizeof(*pITd) / sizeof(uint32_t));
@@ -2398 +2404 @@
  * In general, all URBs should have status OK.
  */
-static void ohciRhXferCompleteIsochronousURB(POHCI pThis, PVUSBURB pUrb, POHCIED pEd, int cFmAge)
+static void ohciRhXferCompleteIsochronousURB(POHCI pThis, PVUSBURB pUrb /*, POHCIED pEd , int cFmAge*/)
 {
     /*
@@ -2553 +2559 @@
 static void ohciRhXferCompleteGeneralURB(POHCI pThis, PVUSBURB pUrb, POHCIED pEd, int cFmAge)
 {
+    RT_NOREF(cFmAge);
+
     /*
      * Copy the data back (if IN operation) and update the TDs.
@@ -2748 +2756 @@
      */
     if (pUrb->enmType == VUSBXFERTYPE_ISOC)
-        ohciRhXferCompleteIsochronousURB(pThis, pUrb, &Ed, cFmAge);
+        ohciRhXferCompleteIsochronousURB(pThis, pUrb /*, &Ed , cFmAge*/);
     else
         ohciRhXferCompleteGeneralURB(pThis, pUrb, &Ed, cFmAge);
@@ -2832 +2840 @@
  * Service a general transport descriptor.
  */
-static bool ohciServiceTd(POHCI pThis, VUSBXFERTYPE enmType, PCOHCIED pEd, uint32_t EdAddr, uint32_t TdAddr, uint32_t *pNextTdAddr, const char *pszListName)
-{
+static bool ohciServiceTd(POHCI pThis, VUSBXFERTYPE enmType, PCOHCIED pEd, uint32_t EdAddr, uint32_t TdAddr,
+                          uint32_t *pNextTdAddr, const char *pszListName)
+{
+    RT_NOREF(pszListName);
+
     /*
      * Read the TD and setup the buffer data.
@@ -2943 +2954 @@
                                   uint32_t TdAddr, uint32_t *pNextTdAddr, const char *pszListName)
 {
+    RT_NOREF(pszListName);
+
     /*
      * Read the TDs involved in this URB.
@@ -4055 +4068 @@
 static DECLCALLBACK(bool) ohciR3StartFrame(PVUSBIROOTHUBPORT pInterface, uint32_t u32FrameNo)
 {
+    RT_NOREF(u32FrameNo);
     POHCI pThis = VUSBIROOTHUBPORT_2_OHCI(pInterface);
 
@@ -4111 +4125 @@
 static DECLCALLBACK(void) ohciFrameBoundaryTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
+    RT_NOREF(pDevIns, pTimer, pvUser);
 }
 
@@ -5334 +5349 @@
 static DECLCALLBACK(int) ohciR3Map(PPCIDEVICE pPciDev, int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType)
 {
+    RT_NOREF(iRegion, enmType);
     POHCI pThis = (POHCI)pPciDev;
     int rc = PDMDevHlpMMIORegister(pThis->CTX_SUFF(pDevIns), GCPhysAddress, cb, NULL /*pvUser*/,
@@ -5370 +5386 @@
 static DECLCALLBACK(int) ohciR3SavePrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
+    RT_NOREF(pSSM);
     POHCI pThis = PDMINS_2_DATA(pDevIns, POHCI);
     POHCIROOTHUB pRh = &pThis->RootHub;
@@ -5455 +5472 @@
 static DECLCALLBACK(int) ohciR3SaveDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
+    RT_NOREF(pSSM);
     POHCI pThis = PDMINS_2_DATA(pDevIns, POHCI);
+    LogFlow(("ohciR3SaveDone: \n"));
+
+    /*
+     * NULL the dev pointers.
+     */
     POHCIROOTHUB pRh = &pThis->RootHub;
-    OHCIROOTHUB Rh;
-    unsigned i;
-    LogFlow(("ohciR3SaveDone: \n"));
-
-    /*
-     * NULL the dev pointers.
-     */
-    Rh = *pRh;
-    for (i = 0; i < RT_ELEMENTS(pRh->aPorts); i++)
+    OHCIROOTHUB Rh = *pRh;
+    for (unsigned i = 0; i < RT_ELEMENTS(pRh->aPorts); i++)
     {
         if (   pRh->aPorts[i].pDev
@@ -5475 +5491 @@
      * Attach the devices.
      */
-    for (i = 0; i < RT_ELEMENTS(pRh->aPorts); i++)
+    for (unsigned i = 0; i < RT_ELEMENTS(pRh->aPorts); i++)
     {
         PVUSBIDEVICE pDev = Rh.aPorts[i].pDev;
@@ -5499 +5515 @@
 static DECLCALLBACK(int) ohciR3LoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    int rc = VINF_SUCCESS;
+    RT_NOREF(pSSM);
     POHCI pThis = PDMINS_2_DATA(pDevIns, POHCI);
     LogFlow(("ohciR3LoadPrep:\n"));
     if (!pThis->pLoad)
     {
-        POHCIROOTHUB pRh = &pThis->RootHub;
-        OHCILOAD Load;
-        unsigned i;
-
         /*
          * Detach all devices which are present in this session. Save them in the load
          * structure so we can reattach them after restoring the guest.
          */
+        POHCIROOTHUB pRh = &pThis->RootHub;
+        OHCILOAD Load;
         Load.pTimer = NULL;
         Load.cDevs = 0;
-        for (i = 0; i < RT_ELEMENTS(pRh->aPorts); i++)
+        for (unsigned i = 0; i < RT_ELEMENTS(pRh->aPorts); i++)
         {
             PVUSBIDEVICE pDev = pRh->aPorts[i].pDev;
@@ -5539 +5553 @@
     /* else: we ASSUME no device can be attached or detach in the period
      *       between a state load and the pLoad stuff is processed. */
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -5729 +5743 @@
 static DECLCALLBACK(int) ohciR3LoadDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
+    RT_NOREF(pSSM);
     POHCI pThis = PDMINS_2_DATA(pDevIns, POHCI);
     LogFlow(("ohciR3LoadDone:\n"));
@@ -5754 +5769 @@
 static DECLCALLBACK(void) ohciR3LoadReattachDevices(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
+    RT_NOREF(pDevIns);
     POHCI pThis = (POHCI)pvUser;
     POHCILOAD pLoad = pThis->pLoad;
@@ -5830 +5846 @@
 static DECLCALLBACK(void) ohciR3InfoRegs(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
+    RT_NOREF(pszArgs);
     POHCI pThis = PDMINS_2_DATA(pDevIns, POHCI);
     uint32_t val, ctl, status;
@@ -5886 +5903 @@
 static DECLCALLBACK(void) ohciR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
+    RT_NOREF(offDelta);
     POHCI pThis = PDMINS_2_DATA(pDevIns, POHCI);
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);