From owner-svn-src-stable-10@FreeBSD.ORG  Sat Apr 25 01:23:30 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0721618F;
 Sat, 25 Apr 2015 01:23:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 E7DAE1C4B;
 Sat, 25 Apr 2015 01:23:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3P1NTHC053213;
 Sat, 25 Apr 2015 01:23:29 GMT (envelope-from rpaulo@FreeBSD.org)
Received: (from rpaulo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3P1NTxG053212;
 Sat, 25 Apr 2015 01:23:29 GMT (envelope-from rpaulo@FreeBSD.org)
Message-Id: <201504250123.t3P1NTxG053212@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to
 rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sat, 25 Apr 2015 01:23:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r281964 - stable/10/sys/dev/atkbdc
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Apr 2015 01:23:30 -0000

Author: rpaulo
Date: Sat Apr 25 01:23:29 2015
New Revision: 281964
URL: https://svnweb.freebsd.org/changeset/base/281964

Log:
  MFC r281704:
    Synaptics: don't report the middle button when clickPad is used.

Modified:
  stable/10/sys/dev/atkbdc/psm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/atkbdc/psm.c
==============================================================================
--- stable/10/sys/dev/atkbdc/psm.c	Sat Apr 25 01:11:33 2015	(r281963)
+++ stable/10/sys/dev/atkbdc/psm.c	Sat Apr 25 01:23:29 2015	(r281964)
@@ -2746,7 +2746,8 @@ proc_synaptics(struct psm_softc *sc, pac
 			touchpad_buttons |= MOUSE_BUTTON4DOWN;
 		if ((pb->ipacket[3] ^ pb->ipacket[0]) & 0x02)
 			touchpad_buttons |= MOUSE_BUTTON5DOWN;
-	} else if (sc->synhw.capExtended && sc->synhw.capMiddle) {
+	} else if (sc->synhw.capExtended && sc->synhw.capMiddle &&
+	    !sc->synhw.capClickPad) {
 		/* Middle Button */
 		if ((pb->ipacket[0] ^ pb->ipacket[3]) & 0x01)
 			touchpad_buttons |= MOUSE_BUTTON2DOWN;