From owner-p4-projects@FreeBSD.ORG  Sun Jul 26 17:45:50 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 373251065670; Sun, 26 Jul 2009 17:45:50 +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 EA80C106566B
	for <perforce@FreeBSD.org>; Sun, 26 Jul 2009 17:45:49 +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 D88D58FC0A
	for <perforce@FreeBSD.org>; Sun, 26 Jul 2009 17:45:49 +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 n6QHjnus027111
	for <perforce@FreeBSD.org>; Sun, 26 Jul 2009 17:45:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6QHjnvr027109
	for perforce@freebsd.org; Sun, 26 Jul 2009 17:45:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 26 Jul 2009 17:45:49 GMT
Message-Id: <200907261745.n6QHjnvr027109@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 166592 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:45:50 -0000

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

Change 166592 by hselasky@hselasky_laptop001 on 2009/07/26 17:45:02

	
	USB input:
	 - improve last patch

Affected files ...

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

Differences ...

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

@@ -190,6 +190,7 @@
 	struct usb_page_cache *pc;
 	uint8_t *buf = sc->sc_temp;
 	int32_t buttons = 0;
+	int32_t buttons_found = 0;
 	int32_t dw = 0;
 	int32_t dx = 0;
 	int32_t dy = 0;
@@ -268,19 +269,21 @@
 			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;
+			if (id != info->sc_iid_btn[i])
 				continue;
-			}
 			/* check for button pressed */
 			if (hid_get_data(buf, len, &info->sc_loc_btn[i]))
 				buttons |= mask;
+			/* register button mask */
+			buttons_found |= mask;
 		}
 
 		if (++info != &sc->sc_info[UMS_INFO_MAX])
 			goto repeat;
 
+		/* keep old button value(s) for non-detected buttons */
+		buttons |= sc->sc_status.button & ~buttons_found;
+
 		if (dx || dy || dz || dt || dw ||
 		    (buttons != sc->sc_status.button)) {