From owner-p4-projects@FreeBSD.ORG  Sun Jul 26 17:24:27 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 92E621065677; Sun, 26 Jul 2009 17:24:26 +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 4DFD31065673
	for <perforce@FreeBSD.org>; Sun, 26 Jul 2009 17:24:26 +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 3B9478FC27
	for <perforce@FreeBSD.org>; Sun, 26 Jul 2009 17:24:26 +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 n6QHOQNL025534
	for <perforce@FreeBSD.org>; Sun, 26 Jul 2009 17:24:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6QHOQmo025532
	for perforce@freebsd.org; Sun, 26 Jul 2009 17:24:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 26 Jul 2009 17:24:26 GMT
Message-Id: <200907261724.n6QHOQmo025532@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 166590 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: Sun, 26 Jul 2009 17:24:28 -0000

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

Change 166590 by hselasky@hselasky_laptop001 on 2009/07/26 17:24:17

	
	USB input:
	 - fix for spurious USB mouse button release when using multi-ID HID reports.
	 - reported by Kostik Belousov

Affected files ...

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

Differences ...

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

@@ -265,11 +265,17 @@
 			dt -= hid_get_data(buf, len, &info->sc_loc_t);
 
 		for (i = 0; i < info->sc_buttons; i++) {
-			if (id != info->sc_iid_btn[i])
+			uint32_t mask;
+			mask = 1UL << UMS_BUT(i);
+			/* check for correct button ID */
+			if (id != info->sc_iid_btn[i]) {
+				/* keep old button value */
+				buttons |= sc->sc_status.button & mask;
 				continue;
-			if (hid_get_data(buf, len, &info->sc_loc_btn[i])) {
-				buttons |= (1 << UMS_BUT(i));
 			}
+			/* check for button pressed */
+			if (hid_get_data(buf, len, &info->sc_loc_btn[i]))
+				buttons |= mask;
 		}
 
 		if (++info != &sc->sc_info[UMS_INFO_MAX])