Changeset 47768 in vbox
- Timestamp:
- Aug 15, 2013 2:11:01 PM (12 years ago)
- svn:sync-xref-src-repo-rev:
- 88027
- Location:
- trunk/src/VBox/Devices/Input
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Input/UsbMouse.cpp
r47727 r47768 132 132 int32_t dy; 133 133 int32_t dz; 134 int32_t dw; 134 135 } Relative; 135 136 struct … … 245 246 int8_t dy; 246 247 int8_t dz; 248 int8_t dw; 247 249 } USBHIDM_REPORT, *PUSBHIDM_REPORT; 248 250 … … 385 387 /* Usage */ 0x09, 0x31, /* Y */ 386 388 /* Usage */ 0x09, 0x38, /* Z (wheel) */ 389 /* Usage Page */ 0x05, 0x0C, /* Consumer Devices */ 390 /* Usage */ 0x0A, 0x38, 0x02,/* AC Pan (horizontal wheel) */ 387 391 /* Logical Minimum */ 0x15, 0x81, /* -127 */ 388 392 /* Logical Maximum */ 0x25, 0x7F, /* +127 */ 389 393 /* Report Size */ 0x75, 0x08, /* 8 */ 390 /* Report Count */ 0x95, 0x0 3, /* 3*/394 /* Report Count */ 0x95, 0x04, /* 4 */ 391 395 /* Input */ 0x81, 0x06, /* Data, Value, Relative, Bit field */ 392 396 /* End Collection */ 0xC0, … … 1208 1212 pReport->m.dy = clamp_i8(pAccumulated->u.Relative.dy); 1209 1213 pReport->m.dz = clamp_i8(pAccumulated->u.Relative.dz); 1214 pReport->m.dw = clamp_i8(pAccumulated->u.Relative.dw); 1210 1215 1211 1216 cbCopy = sizeof(pReport->m); 1212 LogRel3(("Rel event, dx=%d, dy=%d, dz=%d, fButtons=%02x, report size %d\n",1213 pReport->m.dx, pReport->m.dy, pReport->m.dz, 1217 LogRel3(("Rel event, dx=%d, dy=%d, dz=%d, dw=%d, fButtons=%02x, report size %d\n", 1218 pReport->m.dx, pReport->m.dy, pReport->m.dz, pReport->m.dw, 1214 1219 pReport->m.fButtons, cbCopy)); 1215 1220 break; … … 1435 1440 pThis->PtrDelta.u.Relative.dy += dy; 1436 1441 pThis->PtrDelta.u.Relative.dz -= dz; /* Inverted! */ 1442 pThis->PtrDelta.u.Relative.dw += dw; 1437 1443 1438 1444 /* Send a report if possible. */ -
trunk/src/VBox/Devices/Input/testcase/tstUsbMouse.cpp
r47674 r47768 185 185 || Urb.abData[1] != 123 /* x */ 186 186 || Urb.abData[2] != 240 /* 256 - y */ 187 || Urb.abData[3] != 255 /* z */) 187 || Urb.abData[3] != 255 /* z */ 188 || Urb.abData[4] != 255 /* w */) 188 189 rc = VERR_GENERAL_FAILURE; 189 190 }
Note:
See TracChangeset
for help on using the changeset viewer.