From 36ad09a7b5881767475495a1d3ae461b1d134f2f Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Thu, 26 Jan 2012 02:50:15 +0000 Subject: [PATCH] [MOUHID] - Multiple the scroll value by WHEEL_DELTA (120) like i8042prt does - Scrolling with USB mice works now - Disable debugging svn path=/branches/usb-bringup-trunk/; revision=55191 --- drivers/hid/mouhid/mouhid.c | 6 +++--- drivers/hid/mouhid/mouhid.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/hid/mouhid/mouhid.c b/drivers/hid/mouhid/mouhid.c index 1fb6af85419..350b4abeadc 100644 --- a/drivers/hid/mouhid/mouhid.c +++ b/drivers/hid/mouhid/mouhid.c @@ -219,15 +219,15 @@ MouHid_ReadCompletion( { /* store wheel status */ MouseInputData.ButtonFlags |= MOUSE_WHEEL; - MouseInputData.ButtonData = (USHORT)UsageValue; /* FIXME */ + MouseInputData.ButtonData = (USHORT)(UsageValue * WHEEL_DELTA); } else { - DPRINT1("[MOUHID] failed to get wheel status with %x\n", Status); + DPRINT("[MOUHID] failed to get wheel status with %x\n", Status); } } - DPRINT1("[MOUHID] LastX %ld LastY %ld Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); + DPRINT("[MOUHID] LastX %ld LastY %ld Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); /* dispatch mouse action */ MouHid_DispatchInputData(DeviceExtension, &MouseInputData); diff --git a/drivers/hid/mouhid/mouhid.h b/drivers/hid/mouhid/mouhid.h index 1f742ccc22a..c00fcb55f88 100644 --- a/drivers/hid/mouhid/mouhid.h +++ b/drivers/hid/mouhid/mouhid.h @@ -110,6 +110,7 @@ typedef struct }MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION; +#define WHEEL_DELTA 120 NTSTATUS MouHid_InitiateRead(