Changeset 39091 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Oct 24, 2011 1:58:22 PM (14 years ago)

Author:

vboxsync

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

74523

Message:

More parameter warning fixes; made PciIch9 check the saved state version.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (8 diffs)
• DevHPET.cpp (modified) (5 diffs)
• DevPIC.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -948 +948 @@
 {
     ACPIState *pThis = (ACPIState *)pvUser;
-    Assert(TMTimerIsLockOwner(pThis->pPmTimerR3));
+    Assert(TMTimerIsLockOwner(pTimer));
+    NOREF(pDevIns);
 
     DEVACPI_LOCK_R3(pThis);
@@ -957 +958 @@
     DEVACPI_UNLOCK(pThis);
 
-    acpiPmTimerReset(pThis, TMTimerGet(pThis->pPmTimerR3));
+    acpiPmTimerReset(pThis, TMTimerGet(pTimer));
 }
 
@@ -1409 +1410 @@
 PDMBOTHCBDECL(int) acpiPm1aEnRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
+    NOREF(pDevIns); NOREF(Port);
     if (cb != 2)
         return VERR_IOM_IOPORT_UNUSED;
@@ -1601 +1603 @@
     }
 
+    NOREF(pvUser); NOREF(Port);
     return rc;
 }
@@ -1714 +1717 @@
 {
     Log(("acpiResetWrite: %#x\n", u32));
+    NOREF(pvUser);
     if (cb != 1)
         return PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "cb=%d Port=%u u32=%#x\n", cb, Port, u32);
@@ -1734 +1738 @@
 PDMBOTHCBDECL(int) acpiDhexWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
+    NOREF(pvUser);
     switch (cb)
     {
@@ -1755 +1760 @@
 PDMBOTHCBDECL(int) acpiDchrWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
+    NOREF(pvUser);
     switch (cb)
     {
@@ -2770 +2776 @@
     ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
     pThis->pPmTimerRC = TMTimerRCPtr(pThis->pPmTimerR3);
+    NOREF(offDelta);
 }
 

trunk/src/VBox/Devices/PC/DevHPET.cpp

@@ -865 +865 @@
     HpetState      *pThis  = PDMINS_2_DATA(pDevIns, HpetState*);
     uint32_t const  idxReg = (uint32_t)(GCPhysAddr - HPET_BASE);
+    NOREF(pvUser);
 
     LogFlow(("hpetMMIORead (%d): %llx (%x)\n", cb, (uint64_t)GCPhysAddr, idxReg));
@@ -955 +956 @@
     LogFlow(("hpetMMIOWrite: cb=%u reg=%03x (%RGp) val=%llx\n",
              cb, idxReg, GCPhysAddr, cb == 4 ? *(uint32_t *)pv : cb == 8 ? *(uint64_t *)pv : 0xdeadbeef));
+    NOREF(pvUser);
 
     int rc;
@@ -1122 +1124 @@
 {
     HpetState *pThis = PDMINS_2_DATA(pDevIns, HpetState *);
+    NOREF(pszArgs);
 
     pHlp->pfnPrintf(pHlp,
@@ -1154 +1157 @@
 {
     HpetState *pThis = PDMINS_2_DATA(pDevIns, HpetState *);
+    NOREF(uPass);
 
     SSMR3PutU8(pSSM, HPET_CAP_GET_TIMERS(pThis->u32Capabilities));
@@ -1278 +1282 @@
     HpetState *pThis = PDMINS_2_DATA(pDevIns, HpetState *);
     LogFlow(("hpetRelocate:\n"));
+    NOREF(offDelta);
 
     pThis->pDevInsRC    = PDMDEVINS_2_RCPTR(pDevIns);

trunk/src/VBox/Devices/PC/DevPIC.cpp

@@ -730 +730 @@
         return VINF_SUCCESS;
     }
+    NOREF(Port);
     return VERR_IOM_IOPORT_UNUSED;
 }
@@ -753 +754 @@
         PIC_UNLOCK(PDMINS_2_DATA(pDevIns, PDEVPIC));
     }
+    NOREF(Port);
     return VINF_SUCCESS;
 }
@@ -769 +771 @@
 {
     PDEVPIC pThis = PDMINS_2_DATA(pDevIns, PDEVPIC);
+    NOREF(pszArgs);
 
     /*
      * Show info.
      */
-    for (int i=0;i<2;i++)
-    {
-        PicState    *pPic;
-
-        pPic = &pThis->aPics[i];
+    for (int i = 0; i < 2; i++)
+    {
+        PicState   *pPic = &pThis->aPics[i];
+
         pHlp->pfnPrintf(pHlp, "PIC%d:\n", i);
         pHlp->pfnPrintf(pHlp, " IMR :%02x ISR   :%02x IRR   :%02x LIRR:%02x\n",
@@ -984 +986 @@
 
     /*
-     * Since the PIC helper interface provides access to the PDM lock, 
-     * we need no device level critical section. 
+     * Since the PIC helper interface provides access to the PDM lock,
+     * we need no device level critical section.
      */
     rc = PDMDevHlpSetDeviceCritSect(pDevIns, PDMDevHlpCritSectGetNop(pDevIns));