Changeset 52128 in vbox for trunk/src/VBox/Devices/Input

Timestamp:

Jul 22, 2014 3:01:00 PM (10 years ago)

Author:

vboxsync

Message:

PS2M: Do not delay resets (too much trouble).

File:

• trunk/src/VBox/Devices/Input/PS2M.cpp (modified) (6 diffs)

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

@@ -219 +219 @@
     /** Set if the throttle delay is active. */
     bool                fThrottleActive;
+    /** Set if the throttle delay is active. */
+    bool                fDelayReset;
     /** Operational mode. */
     PS2M_MODE           enmMode;
@@ -401 +403 @@
     if (pDrv)
         pDrv->pfnReportModes(pDrv, fEnabled, false, false);
+}
+
+/* Reset the pointing device. */
+static void ps2mReset(PPS2M pThis)
+{
+    ps2kInsertQueue((GeneriQ *)&pThis->cmdQ, ARSP_BAT_OK);
+    ps2kInsertQueue((GeneriQ *)&pThis->cmdQ, 0);
+    pThis->enmMode   = AUX_MODE_STD;
+    pThis->u8CurrCmd = 0;
+
+    //@todo: move to its proper home!
+    ps2mSetDriverState(pThis, true);
 }
 
@@ -525 +539 @@
     }
 
+#ifndef IN_RING3
+    /* Reset and Set Default commands must be run in R3. */
+    if (cmd == ACMD_RESET || cmd == ACMD_SET_DEFAULT)
+        return VINF_IOM_R3_IOPORT_WRITE;
+#endif
+
     switch (cmd)
     {
@@ -576 +596 @@
         case ACMD_ENABLE:
             pThis->u8State |= AUX_STATE_ENABLED;
-            //@todo: R3 only!
 #ifdef IN_RING3
             ps2mSetDriverState(pThis, true);
+#else
+            AssertLogRelMsgFailed(("Invalid ACMD_ENABLE outside R3!\n"));
 #endif
             ps2kClearQueue((GeneriQ *)&pThis->evtQ);
@@ -603 +624 @@
             pThis->enmMode   = AUX_MODE_RESET;
             ps2kInsertQueue((GeneriQ *)&pThis->cmdQ, ARSP_ACK);
-            /* Slightly delay reset completion; it might take hundreds of ms. */
-            TMTimerSetMillies(pThis->CTX_SUFF(pDelayTimer), 1);
+            if (pThis->fDelayReset)
+                /* Slightly delay reset completion; it might take hundreds of ms. */
+                TMTimerSetMillies(pThis->CTX_SUFF(pDelayTimer), 1);
+            else
+#ifdef IN_RING3
+                ps2mReset(pThis);
+#else
+                AssertLogRelMsgFailed(("Invalid ACMD_RESET outside R3!\n"));
+#endif
             break;
         /* The following commands need a parameter. */
@@ -777 +805 @@
 
     Assert(pThis->u8CurrCmd == ACMD_RESET);
-    ps2kInsertQueue((GeneriQ *)&pThis->cmdQ, ARSP_BAT_OK);
-    ps2kInsertQueue((GeneriQ *)&pThis->cmdQ, 0);
-    pThis->enmMode   = AUX_MODE_STD;
-    pThis->u8CurrCmd = 0;
+    ps2mReset(pThis);
 
     ///@todo Might want a PS2MCompleteCommand() to push last response, clear command, and kick the KBC...
     /* Give the KBC a kick. */
     KBCUpdateInterrupts(pThis->pParent);
-
-    //@todo: move to its proper home!
-    ps2mSetDriverState(pThis, true);
 }