svn commit: r281127 - in head/sys: dev/atkbdc sys

[Rui Paulo]

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;