From owner-svn-src-head@FreeBSD.ORG Mon Apr 6 01:04:09 2015 Return-Path: Delivered-To: svn-src-head@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 DFB17442; Mon, 6 Apr 2015 01:04:09 +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 B2B67856; Mon, 6 Apr 2015 01:04:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t36149nZ076490; Mon, 6 Apr 2015 01:04:09 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t36148i3076488; Mon, 6 Apr 2015 01:04:08 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201504060104.t36148i3076488@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Mon, 6 Apr 2015 01:04:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281127 - in head/sys: dev/atkbdc sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 01:04:10 -0000 Author: rpaulo Date: Mon Apr 6 01:04:08 2015 New Revision: 281127 URL: https://svnweb.freebsd.org/changeset/base/281127 Log: psm: print newer Synaptics Touchpad capabilities. Modified: head/sys/dev/atkbdc/psm.c head/sys/sys/mouse.h Modified: head/sys/dev/atkbdc/psm.c ============================================================================== --- head/sys/dev/atkbdc/psm.c Mon Apr 6 00:34:59 2015 (r281126) +++ head/sys/dev/atkbdc/psm.c Mon Apr 6 01:04:08 2015 (r281127) @@ -4483,8 +4483,12 @@ enable_synaptics(KBDC kbdc, struct psm_s synhw.nExtendedQueries = (status[0] & 0x70) != 0; synhw.capMiddle = (status[0] & 0x04) != 0; synhw.capPassthrough = (status[2] & 0x80) != 0; + synhw.capLowPower = (status[2] & 0x40) != 0; + synhw.capMultiFingerReport = + (status[2] & 0x20) != 0; synhw.capSleep = (status[2] & 0x10) != 0; synhw.capFourButtons = (status[2] & 0x08) != 0; + synhw.capBallistics = (status[2] & 0x04) != 0; synhw.capMultiFinger = (status[2] & 0x02) != 0; synhw.capPalmDetect = (status[2] & 0x01) != 0; @@ -4495,8 +4499,12 @@ enable_synaptics(KBDC kbdc, struct psm_s printf(" nExtendedQueries: %d\n", synhw.nExtendedQueries); printf(" capPassthrough: %d\n", synhw.capPassthrough); + printf(" capLowPower: %d\n", synhw.capLowPower); + printf(" capMultiFingerReport: %d\n", + synhw.capMultiFingerReport); printf(" capSleep: %d\n", synhw.capSleep); printf(" capFourButtons: %d\n", synhw.capFourButtons); + printf(" capBallistics: %d\n", synhw.capBallistics); printf(" capMultiFinger: %d\n", synhw.capMultiFinger); printf(" capPalmDetect: %d\n", synhw.capPalmDetect); } Modified: head/sys/sys/mouse.h ============================================================================== --- head/sys/sys/mouse.h Mon Apr 6 00:34:59 2015 (r281126) +++ head/sys/sys/mouse.h Mon Apr 6 01:04:08 2015 (r281127) @@ -108,6 +108,9 @@ typedef struct synapticshw { int capPalmDetect; int capPassthrough; int capMiddle; + int capLowPower; + int capMultiFingerReport; + int capBallistics; int nExtendedButtons; int nExtendedQueries; } synapticshw_t;