From owner-svn-src-head@FreeBSD.ORG  Mon Oct 22 03:00:27 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 012501D7;
 Mon, 22 Oct 2012 03:00:26 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 01CC98FC18;
 Mon, 22 Oct 2012 03:00:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9M30PSv016303;
 Mon, 22 Oct 2012 03:00:25 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9M30PD6016301;
 Mon, 22 Oct 2012 03:00:25 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201210220300.q9M30PD6016301@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 22 Oct 2012 03:00:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241843 - head/sys/dev/usb/input
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Oct 2012 03:00:27 -0000

Author: eadler
Date: Mon Oct 22 03:00:25 2012
New Revision: 241843
URL: http://svn.freebsd.org/changeset/base/241843

Log:
  Make uhid attach to devices that look like keyboards
  or mice if the quirk which prevents higher level
  drivers from attaching is set.
  
  PR:		usb/172458
  Submitted by:	Vitaly Magerya <vmagerya@gmail.com>
  Reviewed by:	hselasky
  Approved by:	cperciva
  MFC after:	1 week

Modified:
  head/sys/dev/usb/input/uhid.c

Modified: head/sys/dev/usb/input/uhid.c
==============================================================================
--- head/sys/dev/usb/input/uhid.c	Mon Oct 22 03:00:20 2012	(r241842)
+++ head/sys/dev/usb/input/uhid.c	Mon Oct 22 03:00:25 2012	(r241843)
@@ -691,10 +691,11 @@ uhid_probe(device_t dev)
 	 */
 	if ((uaa->info.bInterfaceClass == UICLASS_HID) &&
 	    (uaa->info.bInterfaceSubClass == UISUBCLASS_BOOT) &&
-	    ((uaa->info.bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD) ||
-	     (uaa->info.bInterfaceProtocol == UIPROTO_MOUSE))) {
+	    (((uaa->info.bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD) &&
+	      !usb_test_quirk(uaa, UQ_KBD_IGNORE)) ||
+	     ((uaa->info.bInterfaceProtocol == UIPROTO_MOUSE) &&
+	      !usb_test_quirk(uaa, UQ_UMS_IGNORE))))
 		return (ENXIO);
-	}
 
 	return (BUS_PROBE_GENERIC);
 }