Changeset 47796 in vbox

Timestamp:

Aug 16, 2013 10:31:34 AM (11 years ago)

Author:

vboxsync

Message:

Devices/Input: reverting r88027 as several guests did not like it.

Location:

trunk/src/VBox/Devices/Input

Files:

• UsbMouse.cpp (modified) (5 diffs)
• testcase/tstUsbMouse.cpp (modified) (1 diff)

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

@@ -132 +132 @@
             int32_t     dy;
             int32_t     dz;
-            int32_t     dw;
         } Relative;
         struct
@@ -246 +245 @@
     int8_t      dy;
     int8_t      dz;
-    int8_t      dw;
 } USBHIDM_REPORT, *PUSBHIDM_REPORT;
 
@@ -387 +385 @@
     /* Usage */                     0x09, 0x31,     /* Y */
     /* Usage */                     0x09, 0x38,     /* Z (wheel) */
-    /* Usage Page */                0x05, 0x0C,     /* Consumer Devices */
-    /* Usage */                     0x0A, 0x38, 0x02,/* AC Pan (horizontal wheel) */
     /* Logical Minimum */           0x15, 0x81,     /* -127 */
     /* Logical Maximum */           0x25, 0x7F,     /* +127 */
     /* Report Size */               0x75, 0x08,     /* 8 */
-    /* Report Count */              0x95, 0x04,     /* 4 */
+    /* Report Count */              0x95, 0x03,     /* 3 */
     /* Input */                     0x81, 0x06,     /* Data, Value, Relative, Bit field */
     /* End Collection */            0xC0,
@@ -1212 +1208 @@
         pReport->m.dy       = clamp_i8(pAccumulated->u.Relative.dy);
         pReport->m.dz       = clamp_i8(pAccumulated->u.Relative.dz);
-        pReport->m.dw       = clamp_i8(pAccumulated->u.Relative.dw);
     
         cbCopy = sizeof(pReport->m);
-        LogRel3(("Rel event, dx=%d, dy=%d, dz=%d, dw=%d, fButtons=%02x, report size %d\n",
-                 pReport->m.dx, pReport->m.dy, pReport->m.dz, pReport->m.dw,
+        LogRel3(("Rel event, dx=%d, dy=%d, dz=%d, fButtons=%02x, report size %d\n",
+                 pReport->m.dx, pReport->m.dy, pReport->m.dz,
                  pReport->m.fButtons, cbCopy));
         break;
@@ -1440 +1435 @@
     pThis->PtrDelta.u.Relative.dy      += dy;
     pThis->PtrDelta.u.Relative.dz      -= dz;    /* Inverted! */
-    pThis->PtrDelta.u.Relative.dw      += dw;
 
     /* Send a report if possible. */

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

@@ -185 +185 @@
                     || Urb.abData[1] != 123  /* x */
                     || Urb.abData[2] != 240  /* 256 - y */
-                    || Urb.abData[3] != 255  /* z */
-                    || Urb.abData[4] != 255  /* w */)
+                    || Urb.abData[3] != 255  /* z */)
                     rc = VERR_GENERAL_FAILURE;
             }