[src/netbsd-3]: src/sys/dev/usb Pull up following revision(s) (requested by u...

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

details:   https://anonhg.NetBSD.org/src/rev/17c5544e7379
branches:  netbsd-3
changeset: 577765:17c5544e7379
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Jan 22 10:57:02 2006 +0000

description:
Pull up following revision(s) (requested by uwe in ticket #1119):
        sys/dev/usb/ums.c: revision 1.62
Look for a wheel before looking for a Z dir.  This makes Apple's
Mightymouse work.

diffstat:

 sys/dev/usb/ums.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 8ba41c3ee2d9 -r 17c5544e7379 sys/dev/usb/ums.c
--- a/sys/dev/usb/ums.c Sun Jan 22 10:56:31 2006 +0000
+++ b/sys/dev/usb/ums.c Sun Jan 22 10:57:02 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ums.c,v 1.60.16.1 2006/01/22 10:56:31 tron Exp $       */
+/*     $NetBSD: ums.c,v 1.60.16.2 2006/01/22 10:57:02 tron Exp $       */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.60.16.1 2006/01/22 10:56:31 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.60.16.2 2006/01/22 10:57:02 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -193,11 +193,11 @@
 
        /* Try to guess the Z activator: first check Z, then WHEEL. */
        wheel = 0;
-       if (hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Z),
-              uha->reportid, hid_input, &sc->sc_loc_z, &flags) ||
-           (wheel = hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP,
+       if ((wheel = hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP,
                                                       HUG_WHEEL),
-              uha->reportid, hid_input, &sc->sc_loc_z, &flags))) {
+              uha->reportid, hid_input, &sc->sc_loc_z, &flags)) ||
+           hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Z),
+              uha->reportid, hid_input, &sc->sc_loc_z, &flags)) {
                if ((flags & MOUSE_FLAGS_MASK) != MOUSE_FLAGS) {
                        sc->sc_loc_z.size = 0;  /* Bad Z coord, ignore it */
                } else {