[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

diff --git a/drivers/hid/mouhid/mouhid.c b/drivers/hid/mouhid/mouhid.c
index 1fb6af8..350b4ab 100644 (file)
--- 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 1f742cc..c00fcb5 100644 (file)
--- 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(