From owner-p4-projects@FreeBSD.ORG  Thu Jul 23 07:51:08 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DF6061065676; Thu, 23 Jul 2009 07:51:07 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9F25A106564A
	for <perforce@FreeBSD.org>; Thu, 23 Jul 2009 07:51:07 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D4D08FC15
	for <perforce@FreeBSD.org>; Thu, 23 Jul 2009 07:51:07 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6N7p71o076154
	for <perforce@FreeBSD.org>; Thu, 23 Jul 2009 07:51:07 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6N7p71b076152
	for perforce@freebsd.org; Thu, 23 Jul 2009 07:51:07 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 23 Jul 2009 07:51:07 GMT
Message-Id: <200907230751.n6N7p71b076152@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 166432 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jul 2009 07:51:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=166432

Change 166432 by hselasky@hselasky_laptop001 on 2009/07/23 07:50:54

	
	USB input:
	 - fix bad class quirk for UMS driver.
	 - patch by Bryan Venteicher

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/input/ums.c#20 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#20 (text+ko) ====

@@ -535,6 +535,9 @@
 	 * it has two addional buttons and a tilt wheel.
 	 */
 	if (usb_test_quirk(uaa, UQ_MS_BAD_CLASS)) {
+
+		sc->sc_iid = 0;
+
 		info = &sc->sc_info[0];
 		info->sc_flags = (UMS_FLAG_X_AXIS |
 		    UMS_FLAG_Y_AXIS |
@@ -544,11 +547,17 @@
 		isize = 5;
 		/* 1st byte of descriptor report contains garbage */
 		info->sc_loc_x.pos = 16;
+		info->sc_loc_x.size = 8;
 		info->sc_loc_y.pos = 24;
+		info->sc_loc_y.size = 8;
 		info->sc_loc_z.pos = 32;
+		info->sc_loc_z.size = 8;
 		info->sc_loc_btn[0].pos = 8;
+		info->sc_loc_btn[0].size = 1;
 		info->sc_loc_btn[1].pos = 9;
+		info->sc_loc_btn[1].size = 1;
 		info->sc_loc_btn[2].pos = 10;
+		info->sc_loc_btn[2].size = 1;
 
 		/* Announce device */
 		device_printf(dev, "3 buttons and [XYZ] "