[src/trunk]: src/sys/dev/pckbport Add hw.synaptics.movement_enable sysctl. De...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e6a254e8cecc
branches:  trunk
changeset: 828249:e6a254e8cecc
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Dec 05 18:04:21 2017 +0000

description:
Add hw.synaptics.movement_enable sysctl. Default value is 1, but if set
to 0 disables movement events from the touchpad.

While here, fixup a few sysctl nodenum comparisons in
pms_sysctl_synaptics_verify to compare against node numbers instead of
values.

diffstat:

 sys/dev/pckbport/synaptics.c |  30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diffs (86 lines):

diff -r 5b8eb68fc233 -r e6a254e8cecc sys/dev/pckbport/synaptics.c
--- a/sys/dev/pckbport/synaptics.c      Tue Dec 05 03:23:29 2017 +0000
+++ b/sys/dev/pckbport/synaptics.c      Tue Dec 05 18:04:21 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: synaptics.c,v 1.35 2017/11/07 12:39:07 ryoon Exp $     */
+/*     $NetBSD: synaptics.c,v 1.36 2017/12/05 18:04:21 jmcneill Exp $  */
 
 /*
  * Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
 #include "opt_pms.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.35 2017/11/07 12:39:07 ryoon Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.36 2017/12/05 18:04:21 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -118,6 +118,7 @@
 static int synaptics_max_speed_x = 32;
 static int synaptics_max_speed_y = 32;
 static int synaptics_movement_threshold = 4;
+static int synaptics_movement_enable = 1;
 
 /* Sysctl nodes. */
 static int synaptics_button_boundary_nodenum;
@@ -140,6 +141,7 @@
 static int synaptics_max_speed_x_nodenum;
 static int synaptics_max_speed_y_nodenum;
 static int synaptics_movement_threshold_nodenum;
+static int synaptics_movement_enable_nodenum;
 
 static int
 synaptics_poll_cmd(struct pms_softc *psc, ...)
@@ -714,6 +716,18 @@
 
        if ((rc = sysctl_createv(clog, 0, NULL, &node,
            CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
+           CTLTYPE_INT, "movement_enable",
+           SYSCTL_DESCR("Enable movement reporting"),
+           pms_sysctl_synaptics_verify, 0,
+           &synaptics_movement_enable,
+           0, CTL_HW, root_num, CTL_CREATE,
+           CTL_EOL)) != 0)
+               goto err;
+
+       synaptics_movement_enable_nodenum = node->sysctl_num;
+
+       if ((rc = sysctl_createv(clog, 0, NULL, &node,
+           CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
            CTLTYPE_INT, "button_boundary",
            SYSCTL_DESCR("Top edge of button area"),
            pms_sysctl_synaptics_verify, 0,
@@ -808,16 +822,20 @@
                if (t < 0 || t > (SYNAPTICS_EDGE_MAX / 4))
                        return (EINVAL);
        } else
-       if (node.sysctl_num == synaptics_button_boundary) {
+       if (node.sysctl_num == synaptics_button_boundary_nodenum) {
                if (t < 0 || t < SYNAPTICS_EDGE_BOTTOM || 
                    t > SYNAPTICS_EDGE_TOP)
                        return (EINVAL);
        } else
-       if (node.sysctl_num == synaptics_button2 ||
-           node.sysctl_num == synaptics_button3) {
+       if (node.sysctl_num == synaptics_button2_nodenum ||
+           node.sysctl_num == synaptics_button3_nodenum) {
                if (t < SYNAPTICS_EDGE_LEFT || t > SYNAPTICS_EDGE_RIGHT)
                        return (EINVAL);
        } else
+       if (node.sysctl_num == synaptics_movement_enable_nodenum) {
+               if (t < 0 || t > 1)
+                       return (EINVAL);
+       } else
                return (EINVAL);
 
        *(int *)rnode->sysctl_data = t;
@@ -1558,7 +1576,7 @@
         * Do movement processing IFF we have a single finger and no palm or
         * a secondary finger and no palm.
         */
-       if (palm == 0) {
+       if (palm == 0 && synaptics_movement_enable) {
                if (fingers == 1) {
                        synaptics_movement(sc, sp, sp->sp_finger, &dx, &dy);
                } else {