vbox的更動 39091 路徑 trunk/src/VBox/Devices/Input/DevPS2.cpp

時間撮記:

2011-10-24 下午01:58:22 (13 年 以前)

作者:

vboxsync

訊息:

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

檔案:

• trunk/src/VBox/Devices/Input/DevPS2.cpp (修改) (9 筆差異)

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -437 +437 @@
 {
     KBDState *s = (KBDState*)opaque;
-    int val;
-    val = s->status;
+    int val = s->status;
+    NOREF(addr);
+
 #if defined(DEBUG_KBD)
     Log(("kbd: read status=0x%02x\n", val));
@@ -449 +450 @@
     int rc = VINF_SUCCESS;
     KBDState *s = (KBDState*)opaque;
+    NOREF(addr);
 
 #ifdef DEBUG_KBD
@@ -573 +575 @@
     KBDState *s = (KBDState*)opaque;
     uint32_t val;
+    NOREF(addr);
 
     /* Return the current DBB contents. */
@@ -799 +802 @@
 }
 
+#ifdef IN_RING3
+
 static bool kbd_mouse_unreported(KBDState *s)
 {
-   return    s->mouse_dx
-          || s->mouse_dy
-          || s->mouse_dz
-          || s->mouse_dw
-          || s->mouse_buttons != s->mouse_buttons_reported;
-}
-
-#ifdef IN_RING3
+    return s->mouse_dx
+        || s->mouse_dy
+        || s->mouse_dz
+        || s->mouse_dw
+        || s->mouse_buttons != s->mouse_buttons_reported;
+}
+
 static size_t kbd_mouse_event_queue_free(KBDState *s)
 {
@@ -850 +854 @@
     pDrv->pfnReportModes(pDrv, fEnabled, false);
 }
+
 #endif /* IN_RING3 */
 
@@ -1058 +1063 @@
     int rc = VINF_SUCCESS;
     KBDState *s = (KBDState*)opaque;
+    NOREF(addr);
 
 #ifdef DEBUG_KBD
@@ -1593 +1599 @@
 {
     AssertFailedReturn(VERR_NOT_SUPPORTED);
+    NOREF(pInterface); NOREF(uX); NOREF(uY); NOREF(iDeltaZ); NOREF(iDeltaW); NOREF(fButtons);
 }
 
@@ -1717 +1724 @@
             break;
     }
+#else
+    NOREF(pDevIns); NOREF(iLUN); NOREF(fFlags);
 #endif
 }
@@ -1728 +1737 @@
     KBDState   *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
+    NOREF(offDelta);
 }