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

Timestamp:

Jul 3, 2013 1:02:28 PM (12 years ago)

Author:

vboxsync

Message:

Devices/Input/UsbMouse: add multi-touch mode to pfnReportModes in PDM.

Location:

trunk/src/VBox/Devices/Input

Files:

• DevPS2.cpp (modified) (1 diff)
• DrvMouseQueue.cpp (modified) (1 diff)
• UsbMouse.cpp (modified) (1 diff)
• testcase/tstUsbMouse.cpp (modified) (2 diffs)

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

@@ -705 +705 @@
     PPDMIMOUSECONNECTOR pDrv = pThis->Mouse.pDrv;
     bool fEnabled = !!(pThis->mouse_status & MOUSE_STATUS_ENABLED);
-    pDrv->pfnReportModes(pDrv, fEnabled, false);
+    pDrv->pfnReportModes(pDrv, fEnabled, false, false);
 }
 

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

@@ -162 +162 @@
  *
  * @param   pInterface  Pointer to the mouse connector interface structure.
- * @param   fAbs        The new absolute mode state.
- */
-static DECLCALLBACK(void) drvMousePassThruReportModes(PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs)
+ * @param   fRel        Is relative reporting supported?
+ * @param   fAbs        Is absolute reporting supported?
+ * @param   fMT         Is multi-touch reporting supported?
+ */
+static DECLCALLBACK(void) drvMousePassThruReportModes(PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs, bool fMT)
 {
     PDRVMOUSEQUEUE pDrv = PPDMIMOUSECONNECTOR_2_DRVMOUSEQUEUE(pInterface);
-    pDrv->pDownConnector->pfnReportModes(pDrv->pDownConnector, fRel, fAbs);
+    pDrv->pDownConnector->pfnReportModes(pDrv->pDownConnector, fRel, fAbs, fMT);
 }
 

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

@@ -1462 +1462 @@
     pThis->Lun0.pDrv->pfnReportModes(pThis->Lun0.pDrv,
                                      pThis->enmMode == USBHIDMODE_RELATIVE,
-                                     pThis->enmMode == USBHIDMODE_ABSOLUTE);
+                                     pThis->enmMode == USBHIDMODE_ABSOLUTE,
+                                     pThis->enmMode == USBHIDMODE_MULTI_TOUCH);
 
     RTCritSectLeave(&pThis->CritSect);

trunk/src/VBox/Devices/Input/testcase/tstUsbMouse.cpp

@@ -43 +43 @@
     /** Is absolute mode currently supported? */
     bool                        fAbs;
+    /** Is multi-touch mode currently supported? */
+    bool                        fMT;
 } DRVTSTMOUSE, *PDRVTSTMOUSE;
 
@@ -100 +102 @@
  */
 static DECLCALLBACK(void) tstMouseReportModes(PPDMIMOUSECONNECTOR pInterface,
-                                              bool fRel, bool fAbs)
+                                              bool fRel, bool fAbs, bool fMT)
 {
     PDRVTSTMOUSE pDrv = RT_FROM_MEMBER(pInterface, DRVTSTMOUSE, IConnector);
     pDrv->fRel = fRel;
     pDrv->fAbs = fAbs;
+    pDrv->fMT  = fMT;
 }