[src/trunk]: src/sys/dev/usb PR/50701: Martijn van Buul: Adjust MS Confort Mo...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d352f11c2187
branches:  trunk
changeset: 343232:d352f11c2187
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jan 25 18:37:38 2016 +0000

description:
PR/50701: Martijn van Buul: Adjust MS Confort Mouse 6000

diffstat:

 sys/dev/usb/ums.c |  42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)

diffs (63 lines):

diff -r 66281e1c3ee5 -r d352f11c2187 sys/dev/usb/ums.c
--- a/sys/dev/usb/ums.c Mon Jan 25 18:20:16 2016 +0000
+++ b/sys/dev/usb/ums.c Mon Jan 25 18:37:38 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ums.c,v 1.87 2014/01/25 00:03:14 mlelstv Exp $ */
+/*     $NetBSD: ums.c,v 1.88 2016/01/25 18:37:38 christos Exp $        */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.87 2014/01/25 00:03:14 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.88 2016/01/25 18:37:38 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -300,18 +300,32 @@
                }
        }
 
-       /*
-        * The Microsoft Wireless Laser Mouse 6000 v2.0 reports a bad
-        * position for the wheel and wheel tilt controls -- should be
-        * in bytes 3 & 4 of the report.  Fix this if necessary.
-        */
-       if (uha->uaa->vendor == USB_VENDOR_MICROSOFT &&
-           (uha->uaa->product == USB_PRODUCT_MICROSOFT_24GHZ_XCVR10 ||
-            uha->uaa->product == USB_PRODUCT_MICROSOFT_24GHZ_XCVR20)) {
-               if ((sc->flags & UMS_Z) && sc->sc_loc_z.pos == 0)
-                       sc->sc_loc_z.pos = 24;
-               if ((sc->flags & UMS_W) && sc->sc_loc_w.pos == 0)
-                       sc->sc_loc_w.pos = sc->sc_loc_z.pos + 8;
+       if (uha->uaa->vendor == USB_VENDOR_MICROSOFT) {
+               int fixpos;
+               /*
+                * The Microsoft Wireless Laser Mouse 6000 v2.0 and the
+                * Microsoft Comfort Mouse 2.0 report a bad position for
+                * the wheel and wheel tilt controls -- should be in bytes
+                * 3 & 4 of the report. Fix this if necessary.
+                */
+               switch (uha->uaa->product) {
+               case USB_PRODUCT_MICROSOFT_24GHZ_XCVR10:
+               case USB_PRODUCT_MICROSOFT_24GHZ_XCVR20:
+                       fixpos = 24;
+                       break;
+               case USB_PRODUCT_MICROSOFT_CM6000:
+                       fixpos = 40;
+                       break;
+               default:
+                       fixpos = 0;
+                       break;
+               }
+               if (fixpos) {
+                       if ((sc->flags & UMS_Z) && sc->sc_loc_z.pos == 0)
+                               sc->sc_loc_z.pos = fixpos;
+                       if ((sc->flags & UMS_W) && sc->sc_loc_w.pos == 0)
+                               sc->sc_loc_w.pos = sc->sc_loc_z.pos + 8;
+               }
        }
 
        /* figure out the number of buttons */