Changeset 11194 in vbox for trunk/src/VBox/Devices/Input/DevPS2.cpp

Timestamp:

Aug 6, 2008 9:25:20 PM (16 years ago)

Author:

vboxsync

Message:

#1865: DevPS2.

File:

• trunk/src/VBox/Devices/Input/DevPS2.cpp (modified) (15 diffs)

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

@@ -1 +1 @@
 #ifdef VBOX
+/* $Id: $ */
 /** @file
- *
- * VBox input devices:
- * PS/2 keyboard & mouse controller device
+ * DevPS2 - PS/2 keyboard & mouse controller device.
  */
 
@@ -48 +47 @@
  */
 
-
 /*******************************************************************************
 *   Header Files                                                               *
@@ -57 +55 @@
 #include <iprt/assert.h>
 
-#include "Builtins.h"
+#include "../Builtins.h"
 
 #define PCKBD_SAVED_STATE_VERSION 2
@@ -226 +224 @@
 
 #ifdef VBOX
+    /** Pointer to the device instance - RC. */
+    PPDMDEVINSGC                pDevInsRC;
+    /** Pointer to the device instance - R3 . */
+    PPDMDEVINSR3                pDevInsR3;
     /** Pointer to the device instance. */
-    PPDMDEVINSGC                pDevInsGC;
-    /** Pointer to the device instance. */
-    R3R0PTRTYPE(PPDMDEVINS)     pDevInsHC;
+    PPDMDEVINSR0                pDevInsR0;
     /**
      * Keyboard port - LUN#0.
@@ -315 +315 @@
     pic_set_irq(12, irq12_level);
 #else /* VBOX */
-    PDMDevHlpISASetIrq(CTXSUFF(s->pDevIns), 1, irq1_level);
-    PDMDevHlpISASetIrq(CTXSUFF(s->pDevIns), 12, irq12_level);
+    PDMDevHlpISASetIrq(s->CTX_SUFF(pDevIns), 1, irq1_level);
+    PDMDevHlpISASetIrq(s->CTX_SUFF(pDevIns), 12, irq12_level);
 #endif /* VBOX */
 }
@@ -454 +454 @@
         val = 0x01 | (ioport_get_a20() << 1);
 # else /* VBOX */
-        val = 0x01 | (PDMDevHlpA20IsEnabled(CTXSUFF(s->pDevIns)) << 1);
+        val = 0x01 | (PDMDevHlpA20IsEnabled(s->CTX_SUFF(pDevIns)) << 1);
 # endif /* VBOX */
 #else
@@ -471 +471 @@
 #else /* VBOX */
 # ifndef IN_RING3
-        if (!PDMDevHlpA20IsEnabled(CTXSUFF(s->pDevIns)))
+        if (!PDMDevHlpA20IsEnabled(s->CTX_SUFF(pDevIns)))
             rc = VINF_IOM_HC_IOPORT_WRITE;
 # else /* IN_RING3 */
-        PDMDevHlpA20Set(CTXSUFF(s->pDevIns), true);
+        PDMDevHlpA20Set(s->CTX_SUFF(pDevIns), true);
 # endif /* IN_RING3 */
 #endif /* VBOX */
@@ -483 +483 @@
 #else /* VBOX */
 # ifndef IN_RING3
-        if (PDMDevHlpA20IsEnabled(CTXSUFF(s->pDevIns)))
+        if (PDMDevHlpA20IsEnabled(s->CTX_SUFF(pDevIns)))
             rc = VINF_IOM_HC_IOPORT_WRITE;
 # else /* IN_RING3 */
-        PDMDevHlpA20Set(CTXSUFF(s->pDevIns), false);
+        PDMDevHlpA20Set(s->CTX_SUFF(pDevIns), false);
 # endif /* !IN_RING3 */
 #endif /* VBOX */
@@ -503 +503 @@
         rc = VINF_IOM_HC_IOPORT_WRITE;
 # else /* IN_RING3 */
-        rc = PDMDevHlpVMReset(CTXSUFF(s->pDevIns));
+        rc = PDMDevHlpVMReset(s->CTX_SUFF(pDevIns));
 # endif /* !IN_RING3 */
 #endif /* VBOX */
@@ -599 +599 @@
 #else /* VBOX */
         if (aux)
-            PDMDevHlpISASetIrq(CTXSUFF(s->pDevIns), 12, 0);
+            PDMDevHlpISASetIrq(s->CTX_SUFF(pDevIns), 12, 0);
         else
-            PDMDevHlpISASetIrq(CTXSUFF(s->pDevIns), 1, 0);
+            PDMDevHlpISASetIrq(s->CTX_SUFF(pDevIns), 1, 0);
 #endif /* VBOX */
     }
@@ -1012 +1012 @@
 # else /* VBOX */
 #  ifndef IN_RING3
-        if (PDMDevHlpA20IsEnabled(CTXSUFF(s->pDevIns)) != !!(val & 2))
+        if (PDMDevHlpA20IsEnabled(s->CTX_SUFF(pDevIns)) != !!(val & 2))
             rc = VINF_IOM_HC_IOPORT_WRITE;
 #  else /* IN_RING3 */
-        PDMDevHlpA20Set(CTXSUFF(s->pDevIns), !!(val & 2));
+        PDMDevHlpA20Set(s->CTX_SUFF(pDevIns), !!(val & 2));
 #  endif /* !IN_RING3 */
 # endif /* VBOX */
@@ -1026 +1026 @@
             rc = VINF_IOM_HC_IOPORT_WRITE;
 # else
-            rc = PDMDevHlpVMReset(CTXSUFF(s->pDevIns));
+            rc = PDMDevHlpVMReset(s->CTX_SUFF(pDevIns));
 # endif
 #endif /* VBOX */
@@ -1631 +1631 @@
 {
     KBDState   *pData = PDMINS2DATA(pDevIns, KBDState *);
-    pData->pDevInsGC = PDMDEVINS_2_GCPTR(pDevIns);
+    pData->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
 }
 
@@ -1661 +1661 @@
     if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0R0Enabled\0"))
         return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
-    rc = CFGMR3QueryBool(pCfgHandle, "GCEnabled", &fGCEnabled);
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        fGCEnabled = true;
-    else if (VBOX_FAILURE(rc))
-    {
-        AssertMsgFailed(("configuration error: failed to read GCEnabled as boolean. rc=%Vrc\n", rc));
-        return rc;
-    }
-    rc = CFGMR3QueryBool(pCfgHandle, "R0Enabled", &fR0Enabled);
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        fR0Enabled = true;
-    else if (VBOX_FAILURE(rc))
-    {
-        AssertMsgFailed(("configuration error: failed to read R0Enabled as boolean. rc=%Vrc\n", rc));
-        return rc;
-    }
-    Log(("pckbd: fGCEnabled=%d fR0Enabled=%d\n", fGCEnabled, fR0Enabled));
+    rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
+    if (VBOX_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to query \"GCEnabled\" from the config"));
+    rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
+    if (VBOX_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to query \"R0Enabled\" from the config"));
+    Log(("pckbd: fGCEnabled=%RTbool fR0Enabled=%RTbool\n", fGCEnabled, fR0Enabled));
 
 
@@ -1683 +1673 @@
      * Initialize the interfaces.
      */
-    pData->pDevInsHC = pDevIns;
-    pData->pDevInsGC = PDMDEVINS_2_GCPTR(pDevIns);
+    pData->pDevInsR3 = pDevIns;
+    pData->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
+    pData->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
     pData->Keyboard.Base.pfnQueryInterface  = kbdKeyboardQueryInterface;
     pData->Keyboard.Port.pfnPutEvent        = kbdKeyboardPutEvent;