Changeset 51609 in vbox

Timestamp:

Jun 12, 2014 10:01:53 AM (11 years ago)

Author:

vboxsync

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

94347

Message:

DrvMouse: Added queue flush callback like we have for keyboard.

Location:

trunk

Files:

• include/VBox/vmm/pdmifs.h (modified) (5 diffs)
• src/VBox/Devices/Input/DrvMouseQueue.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmifs.h

@@ -378 +378 @@
      * supported by the driver
      *
-     * @param   pInterface      Pointer to the this interface.
+     * @param   pInterface      Pointer to this interface structure.
      * @param   fRelative       Whether relative mode is currently supported.
      * @param   fAbsolute       Whether absolute mode is currently supported.
@@ -384 +384 @@
      */
     DECLR3CALLBACKMEMBER(void, pfnReportModes,(PPDMIMOUSECONNECTOR pInterface, bool fRelative, bool fAbsolute, bool fMultiTouch));
+
+    /**
+     * Flushes the mouse queue if it contains pending events.
+     *
+     * @param   pInterface      Pointer to this interface structure.
+     */
+    DECLR3CALLBACKMEMBER(void, pfnFlushQueue,(PPDMIMOUSECONNECTOR pInterface));
 
 } PDMIMOUSECONNECTOR;
@@ -456 +463 @@
      * Notifies the the downstream driver about an LED change initiated by the guest.
      *
-     * @param   pInterface      Pointer to the this interface.
+     * @param   pInterface      Pointer to this interface structure.
      * @param   enmLeds         The new led mask.
      */
@@ -464 +471 @@
      * Notifies the the downstream driver of changes in driver state.
      *
-     * @param   pInterface      Pointer to the this interface.
+     * @param   pInterface      Pointer to this interface structure.
      * @param   fActive         Whether interface wishes to get "focus".
      */
@@ -472 +479 @@
      * Flushes the keyboard queue if it contains pending events.
      *
-     * @param   pInterface      Pointer to the this interface.
+     * @param   pInterface      Pointer to this interface structure.
      */
     DECLR3CALLBACKMEMBER(void, pfnFlushQueue,(PPDMIKEYBOARDCONNECTOR pInterface));

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

@@ -201 +201 @@
     PDRVMOUSEQUEUE pDrv = PPDMIMOUSECONNECTOR_2_DRVMOUSEQUEUE(pInterface);
     pDrv->pDownConnector->pfnReportModes(pDrv->pDownConnector, fRel, fAbs, fMT);
+}
+
+
+/**
+ * Flush the mouse queue if there are pending events.
+ *
+ * @param   pInterface  Pointer to the mouse connector interface structure.
+ */
+static DECLCALLBACK(void) drvMouseFlushQueue(PPDMIMOUSECONNECTOR pInterface)
+{
+    PDRVMOUSEQUEUE pDrv = PPDMIMOUSECONNECTOR_2_DRVMOUSEQUEUE(pInterface);
+
+    AssertPtr(pDrv->pQueue);
+    PDMQueueFlushIfNecessary(pDrv->pQueue);
 }