From owner-svn-src-all@FreeBSD.ORG  Mon Oct 29 08:11:14 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 95C9FF85;
 Mon, 29 Oct 2012 08:11:14 +0000 (UTC)
 (envelope-from hselasky@c2i.net)
Received: from swip.net (mailfe07.c2i.net [212.247.154.194])
 by mx1.freebsd.org (Postfix) with ESMTP id 9A56B8FC0C;
 Mon, 29 Oct 2012 08:11:12 +0000 (UTC)
X-T2-Spam-Status: No, hits=-1.0 required=5.0 tests=ALL_TRUSTED
Received: from [176.74.213.204] (account mc467741@c2i.net HELO
 laptop015.hselasky.homeunix.org)
 by mailfe07.swip.net (CommuniGate Pro SMTP 5.4.4)
 with ESMTPA id 336465356; Mon, 29 Oct 2012 09:11:04 +0100
From: Hans Petter Selasky <hselasky@c2i.net>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r242280 - stable/8/sys/dev/usb/input
Date: Mon, 29 Oct 2012 09:12:44 +0100
User-Agent: KMail/1.13.7 (FreeBSD/9.1-PRERELEASE; KDE/4.8.4; amd64; ; )
References: <201210290348.q9T3mOgt069287@svn.freebsd.org>
In-Reply-To: <201210290348.q9T3mOgt069287@svn.freebsd.org>
X-Face: 'mmZ:T{)),Oru^0c+/}w'`gU1$ubmG?lp!=R4Wy\ELYo2)@'UZ24N@d2+AyewRX}mAm; Yp
 |U[@, _z/([?1bCfM{_"B<.J>mICJCHAzzGHI{y7{%JVz%R~yJHIji`y>Y}k1C4TfysrsUI
 -%GU9V5]iUZF&nRn9mJ'?&>O
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <201210290912.44795.hselasky@c2i.net>
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, svn-src-stable-8@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Oct 2012 08:11:14 -0000

On Monday 29 October 2012 04:48:24 Eitan Adler wrote:
> Author: eadler
> Date: Mon Oct 29 03:48:24 2012
> New Revision: 242280
> URL: http://svn.freebsd.org/changeset/base/242280
> 
> Log:
>   MFC r241843:
>   	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
>   Approved by:	cperciva (implicit)
> 
> Modified:
>   stable/8/sys/dev/usb/input/uhid.c
> Directory Properties:
>   stable/8/sys/   (props changed)
>   stable/8/sys/dev/   (props changed)
>   stable/8/sys/dev/usb/   (props changed)
> 
> Modified: stable/8/sys/dev/usb/input/uhid.c
> ===========================================================================
> === --- stable/8/sys/dev/usb/input/uhid.c	Mon Oct 29 03:45:38
> 2012	(r242279) +++ stable/8/sys/dev/usb/input/uhid.c	Mon Oct 29 03:48:24
> 2012	(r242280) @@ -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);
>  }

Hi,

You need to MFC this aswell. Else it won't build.

http://svn.freebsd.org/changeset/base/240667

--HPS