[src/trunk]: src/sys/dev/usb Make ums.c work with a "Microsoft Natural Ergono...

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

details:   https://anonhg.NetBSD.org/src/rev/9aefd274fb03
branches:  trunk
changeset: 750780:9aefd274fb03
user:      matthias <matthias%NetBSD.org@localhost>
date:      Thu Jan 14 09:30:39 2010 +0000

description:
Make ums.c work with a "Microsoft Natural Ergonomic Desktop 7000" mouse.
XXX The tilt function still doesn't work for me.

diffstat:

 sys/dev/usb/ums.c          |   7 ++++---
 sys/dev/usb/usbdevs        |   5 +++--
 sys/dev/usb/usbdevs.h      |   5 +++--
 sys/dev/usb/usbdevs_data.h |  10 +++++++---
 4 files changed, 17 insertions(+), 10 deletions(-)

diffs (94 lines):

diff -r 13550c0750dc -r 9aefd274fb03 sys/dev/usb/ums.c
--- a/sys/dev/usb/ums.c Thu Jan 14 07:47:53 2010 +0000
+++ b/sys/dev/usb/ums.c Thu Jan 14 09:30:39 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ums.c,v 1.79 2010/01/12 16:18:58 jakllsch Exp $        */
+/*     $NetBSD: ums.c,v 1.80 2010/01/14 09:30:39 matthias Exp $        */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.79 2010/01/12 16:18:58 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.80 2010/01/14 09:30:39 matthias Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -287,7 +287,8 @@
         * 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_XCVR) {
+           (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)
diff -r 13550c0750dc -r 9aefd274fb03 sys/dev/usb/usbdevs
--- a/sys/dev/usb/usbdevs       Thu Jan 14 07:47:53 2010 +0000
+++ b/sys/dev/usb/usbdevs       Thu Jan 14 09:30:39 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.539 2010/01/12 14:50:38 jakllsch Exp $
+$NetBSD: usbdevs,v 1.540 2010/01/14 09:30:39 matthias Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1601,7 +1601,8 @@
 product MICROSOFT XBOX_CONTROLLER_S10  0x0285  Xbox Controller S (1.0)
 product MICROSOFT XBOX_CONTROLLER_HUB  0x0288  Xbox Controller Hub
 product MICROSOFT XBOX_CONTROLLER_S12  0x0289  Xbox Controller S (1.2)
-product MICROSOFT 24GHZ_XCVR           0x071f  2.4GHz Transceiver V2.0
+product MICROSOFT 24GHZ_XCVR10         0x071d  2.4GHz Transceiver V1.0
+product MICROSOFT 24GHZ_XCVR20         0x071f  2.4GHz Transceiver V2.0
 
 /* Microtech products */
 product MICROTECH SCSIDB25     0x0004  USB-SCSI-DB25
diff -r 13550c0750dc -r 9aefd274fb03 sys/dev/usb/usbdevs.h
--- a/sys/dev/usb/usbdevs.h     Thu Jan 14 07:47:53 2010 +0000
+++ b/sys/dev/usb/usbdevs.h     Thu Jan 14 09:30:39 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdevs.h,v 1.534 2010/01/12 14:51:43 jakllsch Exp $   */
+/*     $NetBSD: usbdevs.h,v 1.535 2010/01/14 09:30:39 matthias Exp $   */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -1608,7 +1608,8 @@
 #define        USB_PRODUCT_MICROSOFT_XBOX_CONTROLLER_S10       0x0285          /* Xbox Controller S (1.0) */
 #define        USB_PRODUCT_MICROSOFT_XBOX_CONTROLLER_HUB       0x0288          /* Xbox Controller Hub */
 #define        USB_PRODUCT_MICROSOFT_XBOX_CONTROLLER_S12       0x0289          /* Xbox Controller S (1.2) */
-#define        USB_PRODUCT_MICROSOFT_24GHZ_XCVR        0x071f          /* 2.4GHz Transceiver V2.0 */
+#define        USB_PRODUCT_MICROSOFT_24GHZ_XCVR10      0x071d          /* 2.4GHz Transceiver V1.0 */
+#define        USB_PRODUCT_MICROSOFT_24GHZ_XCVR20      0x071f          /* 2.4GHz Transceiver V2.0 */
 
 /* Microtech products */
 #define        USB_PRODUCT_MICROTECH_SCSIDB25  0x0004          /* USB-SCSI-DB25 */
diff -r 13550c0750dc -r 9aefd274fb03 sys/dev/usb/usbdevs_data.h
--- a/sys/dev/usb/usbdevs_data.h        Thu Jan 14 07:47:53 2010 +0000
+++ b/sys/dev/usb/usbdevs_data.h        Thu Jan 14 09:30:39 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdevs_data.h,v 1.535 2010/01/12 14:51:43 jakllsch Exp $      */
+/*     $NetBSD: usbdevs_data.h,v 1.536 2010/01/14 09:30:39 matthias Exp $      */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -4743,7 +4743,11 @@
            "Xbox Controller S (1.2)",
        },
        {
-           USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_24GHZ_XCVR,
+           USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_24GHZ_XCVR10,
+           "2.4GHz Transceiver V1.0",
+       },
+       {
+           USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_24GHZ_XCVR20,
            "2.4GHz Transceiver V2.0",
        },
        {
@@ -7035,4 +7039,4 @@
            "Prestige",
        },
 };
-const int usb_nproducts = 1285;
+const int usb_nproducts = 1286;