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

Timestamp:

Apr 8, 2014 1:51:37 PM (11 years ago)

Author:

vboxsync

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

93184

Message:

PS2M: Clear any buffered command response if command reissued.

File:

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

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

@@ -450 +450 @@
     ps2mSetRate(pThis, 100);
 
-    /* Accumulators and button status bits are cleared. */
+    /* Event queue, eccumulators, and button status bits are cleared. */
     ps2kClearQueue((GeneriQ *)&pThis->evtQ);
-    //@todo accumulators/current state
+    pThis->iAccumX = pThis->iAccumY = pThis->iAccumZ = pThis->fAccumB = 0;
 }
 
@@ -507 +507 @@
 
     if (pThis->enmMode == AUX_MODE_RESET)
-    {
         /* In reset mode, do not respond at all. */
         return VINF_SUCCESS;
-    }
-    else if (pThis->enmMode == AUX_MODE_WRAP)
+
+    /* If there's anything left in the command response queue, trash it. */
+    ps2kClearQueue((GeneriQ *)&pThis->cmdQ);
+
+    if (pThis->enmMode == AUX_MODE_WRAP)
     {
         /* In wrap mode, bounce most data right back.*/
@@ -859 +861 @@
 
 #if 1
-    /* Report the event and the throttle timer unless it's already running. */
+    /* Report the event and start the throttle timer unless it's already running. */
     if (!pThis->fThrottleActive)
     {