From owner-svn-src-stable@freebsd.org  Thu Sep 15 08:34:17 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD434BDC40A;
 Thu, 15 Sep 2016 08:34:17 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AD8551C0C;
 Thu, 15 Sep 2016 08:34:17 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8F8YGOR079022;
 Thu, 15 Sep 2016 08:34:16 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8F8YGf7079021;
 Thu, 15 Sep 2016 08:34:16 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201609150834.u8F8YGf7079021@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Thu, 15 Sep 2016 08:34:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r305828 - stable/11/sys/dev/usb/input
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Sep 2016 08:34:18 -0000

Author: hselasky
Date: Thu Sep 15 08:34:16 2016
New Revision: 305828
URL: https://svnweb.freebsd.org/changeset/base/305828

Log:
  MFC r305590:
  Correctly map the USB mouse tilt delta values into buttons 5 and 6
  instead of 3 and 4 which is used for the scroll wheel, according to
  X.org.
  
  PR:		170358

Modified:
  stable/11/sys/dev/usb/input/ums.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/usb/input/ums.c
==============================================================================
--- stable/11/sys/dev/usb/input/ums.c	Thu Sep 15 08:30:47 2016	(r305827)
+++ stable/11/sys/dev/usb/input/ums.c	Thu Sep 15 08:34:16 2016	(r305828)
@@ -288,9 +288,9 @@ ums_intr_callback(struct usb_xfer *xfer,
 
 			/* translate T-axis into button presses until further */
 			if (dt > 0)
-				buttons |= 1UL << 3;
+				buttons |= 1UL << 5;
 			else if (dt < 0)
-				buttons |= 1UL << 4;
+				buttons |= 1UL << 6;
 
 			sc->sc_status.button = buttons;
 			sc->sc_status.dx += dx;