Module Name: src
Committed By: bouyer
Date: Sat Jan 16 17:47:13 UTC 2010
Modified Files:
src/sys/dev/usb [netbsd-5]: ums.c usbdevs
Log Message:
Pull up following revision(s) (requested by matthias in ticket #1243):
sys/dev/usb/usbdevs.h: regen
sys/dev/usb/usbdevs_data.h: regen
sys/dev/usb/usbdevs: revision 1.540
sys/dev/usb/ums.c: revision 1.80
Make ums.c work with a "Microsoft Natural Ergonomic Desktop 7000" mouse.
XXX The tilt function still doesn't work for me.
To generate a diff of this commit:
cvs rdiff -u -r1.73.8.2 -r1.73.8.3 src/sys/dev/usb/ums.c
cvs rdiff -u -r1.519.4.3 -r1.519.4.4 src/sys/dev/usb/usbdevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ums.c
diff -u src/sys/dev/usb/ums.c:1.73.8.2 src/sys/dev/usb/ums.c:1.73.8.3
--- src/sys/dev/usb/ums.c:1.73.8.2 Fri Nov 27 09:49:42 2009
+++ src/sys/dev/usb/ums.c Sat Jan 16 17:47:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.73.8.2 2009/11/27 09:49:42 sborrill Exp $ */
+/* $NetBSD: ums.c,v 1.73.8.3 2010/01/16 17:47:12 bouyer Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.73.8.2 2009/11/27 09:49:42 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.73.8.3 2010/01/16 17:47:12 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -278,7 +278,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)
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.519.4.3 src/sys/dev/usb/usbdevs:1.519.4.4
--- src/sys/dev/usb/usbdevs:1.519.4.3 Fri Nov 27 08:54:13 2009
+++ src/sys/dev/usb/usbdevs Sat Jan 16 17:47:12 2010
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.519.4.3 2009/11/27 08:54:13 sborrill Exp $
+$NetBSD: usbdevs,v 1.519.4.4 2010/01/16 17:47:12 bouyer Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1543,7 +1543,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
