[src/trunk]: src/sys/dev/usb Apply patch from Matthias Pfaller in PR/42546.

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

details:   https://anonhg.NetBSD.org/src/rev/c2bbdcf6f317
branches:  trunk
changeset: 750414:c2bbdcf6f317
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Wed Dec 30 20:38:47 2009 +0000

description:
Apply patch from Matthias Pfaller in PR/42546.

The USB HUT v1.11 document states that:
    "Typical system software will search for application
     collections tagged with either a Mouse or a Pointer usage."

This patch adjusts ums(4) to match not only on
the Mouse usage, but also on the Pointer usage.

diffstat:

 sys/dev/usb/ums.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 3f8a346388db -r c2bbdcf6f317 sys/dev/usb/ums.c
--- a/sys/dev/usb/ums.c Wed Dec 30 20:20:56 2009 +0000
+++ b/sys/dev/usb/ums.c Wed Dec 30 20:38:47 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ums.c,v 1.77 2009/11/27 08:35:05 mbalmer Exp $ */
+/*     $NetBSD: ums.c,v 1.78 2009/12/30 20:38:47 jakllsch Exp $        */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.77 2009/11/27 08:35:05 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.78 2009/12/30 20:38:47 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -137,7 +137,9 @@
 
        uhidev_get_report_desc(uha->parent, &desc, &size);
        if (!hid_is_collection(desc, size, uha->reportid,
-                              HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE)))
+                              HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE)) &&
+           !hid_is_collection(desc, size, uha->reportid,
+                              HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_POINTER)))
                return (UMATCH_NONE);
 
        return (UMATCH_IFACECLASS);