From owner-p4-projects@FreeBSD.ORG  Fri Apr 23 19:32:58 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 97D57106566C; Fri, 23 Apr 2010 19:32:58 +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 5C4EC106564A
	for <perforce@FreeBSD.org>; Fri, 23 Apr 2010 19:32:58 +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 4A29F8FC1A
	for <perforce@FreeBSD.org>; Fri, 23 Apr 2010 19:32:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3NJWw4N058550
	for <perforce@FreeBSD.org>; Fri, 23 Apr 2010 19:32:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3NJWwVZ058548
	for perforce@freebsd.org; Fri, 23 Apr 2010 19:32:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 23 Apr 2010 19:32:58 GMT
Message-Id: <201004231932.o3NJWwVZ058548@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 177279 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 23 Apr 2010 19:32:58 -0000

http://p4web.freebsd.org/@@177279?ac=10

Change 177279 by hselasky@hselasky_laptop001 on 2010/04/23 19:32:37

	USB input:
		- patch from "Henry Hu" to enable support for
		mouse panning wheels.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/input/ums.c#28 edit
.. //depot/projects/usb/src/sys/dev/usb/usbhid.h#12 edit

Differences ...

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

@@ -286,6 +286,12 @@
 			DPRINTFN(6, "x:%d y:%d z:%d t:%d w:%d buttons:0x%08x\n",
 			    dx, dy, dz, dt, dw, buttons);
 
+			/* translate T-axis into button presses until further */
+			if (dt > 0)
+				buttons |= 1UL << 3;
+			else if (dt < 0)
+				buttons |= 1UL << 4;
+
 			sc->sc_status.button = buttons;
 			sc->sc_status.dx += dx;
 			sc->sc_status.dy += dy;
@@ -454,6 +460,12 @@
 		if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) {
 			info->sc_flags |= UMS_FLAG_T_AXIS;
 		}
+	} else if (hid_locate(buf, len, HID_USAGE2(HUP_CONSUMER,
+		HUC_AC_PAN), hid_input, index, &info->sc_loc_t,
+		&flags, &info->sc_iid_t)) {
+
+		if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS)
+			info->sc_flags |= UMS_FLAG_T_AXIS;
 	}
 	/* figure out the number of buttons */
 

==== //depot/projects/usb/src/sys/dev/usb/usbhid.h#12 (text+ko) ====

@@ -156,6 +156,9 @@
 #define	HUD_ERASER		0x0045
 #define	HUD_TABLET_PICK		0x0046
 
+/* Usages, Consumer */
+#define	HUC_AC_PAN		0x0238
+
 #define	HID_USAGE2(p,u) (((p) << 16) | (u))
 
 #define	UHID_INPUT_REPORT 0x01