Author: cgutman Date: Thu Jan 26 02:50:15 2012 New Revision: 55191
URL: http://svn.reactos.org/svn/reactos?rev=55191&view=rev Log: [MOUHID] - Multiple the scroll value by WHEEL_DELTA (120) like i8042prt does - Scrolling with USB mice works now - Disable debugging
Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h
Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/mo... ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] Thu Jan 26 02:50:15 2012 @@ -219,15 +219,15 @@ { /* 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);
Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/mo... ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] Thu Jan 26 02:50:15 2012 @@ -110,6 +110,7 @@
}MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION;
+#define WHEEL_DELTA 120
NTSTATUS MouHid_InitiateRead(