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

Timestamp:

Aug 14, 2013 1:36:09 PM (11 years ago)

Author:

vboxsync

Message:

Devices\Input\UsbMouse: implemented GET_REPORT stubs; report the latest state.

File:

• trunk/src/VBox/Devices/Input/UsbMouse.cpp (modified) (7 diffs)

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

@@ -230 +230 @@
     uint32_t u32LastTouchScanTime;
     bool fTouchReporting;
+    bool fTouchStateUpdated;
 } USBHID;
 /** Pointer to the USB HID instance data. */
@@ -284 +285 @@
     uint32_t    u32ScanTime;
 } USBHIDMT_REPORT, *PUSBHIDMT_REPORT;
+
+typedef struct USBHIDMT_REPORT_POINTER
+{
+    uint8_t     idReport;
+    uint8_t     fButtons;
+    uint16_t    x;
+    uint16_t    y;
+} USBHIDMT_REPORT_POINTER;
 #pragma pack()
 
@@ -1140 +1149 @@
     pThis->enmState = USBHIDREQSTATE_READY;
     pThis->fHasPendingChanges = false;
+    pThis->fTouchStateUpdated = false;
 
     for (unsigned i = 0; i < RT_ELEMENTS(pThis->aEps); i++)
@@ -1353 +1363 @@
         LogRel3(("usbHid: all touch contacts reported\n"));
         pThis->fTouchReporting = false;
-        pThis->fHasPendingChanges = false;
+        pThis->fHasPendingChanges = pThis->fTouchStateUpdated;
     }
     else
@@ -1622 +1632 @@
     }
 
+    pThis->fTouchStateUpdated = true;
     pThis->fHasPendingChanges = true;
 
@@ -1813 +1824 @@
                         u8ReportType, u8ReportID,
                         pUrb->cbData - sizeof(VUSBSETUP), &pUrb->abData[sizeof(VUSBSETUP)]));
-            uint32_t cbData = 0;
             if (pSetup->bRequest == GET_REPORT)
             {
-                if (u8ReportType == 3 && u8ReportID == REPORTID_TOUCH_MAX_COUNT)
+                uint32_t cbData = 0; /* 0 means that the report is unsupported. */
+
+                if (u8ReportType == 1 && u8ReportID == REPORTID_TOUCH_POINTER)
+                {
+                    USBHIDMT_REPORT_POINTER *p = (USBHIDMT_REPORT_POINTER *)&pUrb->abData[sizeof(VUSBSETUP)];
+                    /* The actual state should be reported here. */
+                    p->idReport = REPORTID_TOUCH_POINTER;
+                    p->fButtons = 0;
+                    p->x = 0;
+                    p->y = 0;
+                    cbData = sizeof(USBHIDMT_REPORT_POINTER);
+                }
+                else if (u8ReportType == 1 && u8ReportID == REPORTID_TOUCH_EVENT)
+                {
+                    USBHIDMT_REPORT *p = (USBHIDMT_REPORT *)&pUrb->abData[sizeof(VUSBSETUP)];
+                    /* The actual state should be reported here. */
+                    RT_ZERO(*p);
+                    p->idReport = REPORTID_TOUCH_EVENT;
+                    cbData = sizeof(USBHIDMT_REPORT);
+                }
+                else if (u8ReportType == 3 && u8ReportID == REPORTID_TOUCH_MAX_COUNT)
                 {
                     pUrb->abData[sizeof(VUSBSETUP) + 0] = REPORTID_TOUCH_MAX_COUNT;
@@ -1831 +1861 @@
                     cbData = sizeof(sau8QASampleBlob) + 1;
                 }
+                else if (u8ReportType == 3 && u8ReportID == REPORTID_TOUCH_DEVCONFIG)
+                {
+                    pUrb->abData[sizeof(VUSBSETUP) + 0] = REPORTID_TOUCH_DEVCONFIG;
+                    pUrb->abData[sizeof(VUSBSETUP) + 1] = 2;  /* Device mode:
+                                                               * "HID touch device supporting contact
+                                                               * identifier and contact count maximum."
+                                                               */
+                    pUrb->abData[sizeof(VUSBSETUP) + 2] = 0;  /* Device identifier */
+                    cbData = 3;
+                }
+
+                if (cbData > 0)
+                {
+                    rc = usbHidCompleteOk(pThis, pUrb, sizeof(VUSBSETUP) + cbData);
+                }
+                else
+                {
+                    rc = usbHidCompleteStall(pThis, pEp, pUrb, "Unsupported GET_REPORT MT");
+                }
             }
-
-            rc = usbHidCompleteOk(pThis, pUrb, sizeof(VUSBSETUP) + cbData);
+            else
+            {
+                /* SET_REPORT */
+                rc = usbHidCompleteOk(pThis, pUrb, pUrb->cbData);
+            }
         } break;
         default: