Changeset 27060 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 4, 2010 9:44:59 PM (15 years ago)

Author:

vboxsync

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

58377

Message:

Devices, Main: add support for multiple pointing devices and let the guest choose which to use

File:

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

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

@@ -797 +797 @@
             kbd_mouse_send_packet(s, false);
 }
+
+/* Report a change in status down the driver chain */
+static void kbd_mouse_update_downstream_status(KBDState *pThis)
+{
+    PPDMIMOUSECONNECTOR pDrv = pThis->Mouse.pDrv;
+    bool fEnabled = pThis->mouse_status & MOUSE_STATUS_ENABLED;
+    pDrv->pfnReportModes(pDrv, fEnabled, false);
+}
 #endif /* IN_RING3 */
 
@@ -804 +812 @@
     LogRelFlowFunc(("kbd: write mouse 0x%02x\n", val));
 #endif
+    int rc = VINF_SUCCESS;
     /* Flush the mouse command response queue. */
     s->mouse_command_queue.count = 0;
@@ -863 +872 @@
             break;
         case AUX_ENABLE_DEV:
+#ifdef IN_RING3
+            LogRelFlowFunc(("Enabling mouse device\n"));
             s->mouse_status |= MOUSE_STATUS_ENABLED;
             kbd_queue(s, AUX_ACK, 1);
+            kbd_mouse_update_downstream_status(s);
+#else
+            LogRelFlowFunc(("Enabling mouse device, R0 stub\n"));
+            rc = VINF_IOM_HC_IOPORT_WRITE;
+#endif
             break;
         case AUX_DISABLE_DEV:
+#ifdef IN_RING3
             s->mouse_status &= ~MOUSE_STATUS_ENABLED;
             kbd_queue(s, AUX_ACK, 1);
@@ -873 +890 @@
             s->mouse_event_queue.rptr = 0;
             s->mouse_event_queue.wptr = 0;
+            kbd_mouse_update_downstream_status(s);
+#else
+            rc = VINF_IOM_HC_IOPORT_WRITE;
+#endif
             break;
         case AUX_SET_DEFAULT:
+#ifdef IN_RING3
             s->mouse_sample_rate = 100;
             s->mouse_resolution = 2;
             s->mouse_status = 0;
             kbd_queue(s, AUX_ACK, 1);
+            kbd_mouse_update_downstream_status(s);
+#else
+            rc = VINF_IOM_HC_IOPORT_WRITE;
+#endif
             break;
         case AUX_RESET:
+#ifdef IN_RING3
             s->mouse_sample_rate = 100;
             s->mouse_resolution = 2;
@@ -892 +919 @@
             s->mouse_event_queue.rptr = 0;
             s->mouse_event_queue.wptr = 0;
+            kbd_mouse_update_downstream_status(s);
+#else
+            rc = VINF_IOM_HC_IOPORT_WRITE;
+#endif
             break;
         default:
@@ -975 +1006 @@
         break;
     }
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -1025 +1056 @@
         break;
     }
-    s->write_cmd = 0;
+    /** @todo this was unconditional before.  That looks wrong to me, but I
+     * just can't believe that no one would have noticed before... */
+    if (rc != VINF_IOM_HC_IOPORT_WRITE)
+        s->write_cmd = 0;
     return rc;
 }
@@ -1047 +1081 @@
     s->translate = 0;
     s->scancode_set = 2;
-    s->mouse_status = 0;
+    if (s->mouse_status)
+    {
+        s->mouse_status = 0;
+        kbd_mouse_update_downstream_status(s);
+    }
     s->mouse_resolution = 0;
     s->mouse_sample_rate = 0;