diff options
| author |   bru <bru@openbsd.org> | 2017-06-06 21:53:07 +0000 |
|---|---|---|
| committer | bru <bru@openbsd.org> | 2017-06-06 21:53:07 +0000 |
| commit | bc2601315d93695fa9220865c8f15f32f1e5827a (patch) | |
| tree | ea30000899d15cfd0236dc0c0a2ecb605652f301 | |
| parent | Rewrite the driver to handle 64kb transfers (diff) | |
| download | wireguard-openbsd-bc2601315d93695fa9220865c8f15f32f1e5827a.tar.xz wireguard-openbsd-bc2601315d93695fa9220865c8f15f32f1e5827a.zip | |
Set the weak variant of hysteresis as default.
| -rw-r--r-- | sys/dev/pckbc/pms.c | 9 | ||||
| -rw-r--r-- | sys/dev/usb/ubcmtp.c | 9 | ||||
| -rw-r--r-- | sys/dev/wscons/wsmouseinput.h | 5 |
3 files changed, 7 insertions, 16 deletions
diff --git a/sys/dev/pckbc/pms.c b/sys/dev/pckbc/pms.c index 80f6cfa1d25..9fa5dee0374 100644 --- a/sys/dev/pckbc/pms.c +++ b/sys/dev/pckbc/pms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pms.c,v 1.75 2017/05/08 20:55:29 bru Exp $ */ +/* $OpenBSD: pms.c,v 1.76 2017/06/06 21:53:07 bru Exp $ */ /* $NetBSD: psm.c,v 1.11 2000/06/05 22:20:57 sommerfeld Exp $ */ /*- @@ -236,10 +236,6 @@ static struct wsmouse_param synaptics_params[] = { { WSMOUSECFG_PRESSURE_HI, SYNAPTICS_PRESSURE_HI } }; -static struct wsmouse_param elantech_v4_params[] = { - { WSMOUSECFG_STRONG_HYSTERESIS, 0 } -}; - int pmsprobe(struct device *, void *, void *); void pmsattach(struct device *, struct device *, void *); int pmsactivate(struct device *, int); @@ -2046,8 +2042,7 @@ pms_enable_elantech_v4(struct pms_softc *sc) sc->elantech = NULL; goto err; } - if (wsmouse_configure(sc->sc_wsmousedev, - elantech_v4_params, nitems(elantech_v4_params))) { + if (wsmouse_configure(sc->sc_wsmousedev, NULL, 0)) { free(sc->elantech, M_DEVBUF, 0); sc->elantech = NULL; printf("%s: setup failed\n", DEVNAME(sc)); diff --git a/sys/dev/usb/ubcmtp.c b/sys/dev/usb/ubcmtp.c index 86ef3f3c6f4..388850ea7ea 100644 --- a/sys/dev/usb/ubcmtp.c +++ b/sys/dev/usb/ubcmtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubcmtp.c,v 1.16 2017/05/08 20:55:29 bru Exp $ */ +/* $OpenBSD: ubcmtp.c,v 1.17 2017/06/06 21:53:07 bru Exp $ */ /* * Copyright (c) 2013-2014, joshua stein <jcs@openbsd.org> @@ -131,10 +131,6 @@ struct ubcmtp_finger { /* Use a constant, synaptics-compatible pressure value for now. */ #define DEFAULT_PRESSURE 40 -static struct wsmouse_param ubcmtp_params[] = { - { WSMOUSECFG_STRONG_HYSTERESIS, 0 } -}; - struct ubcmtp_limit { int limit; int min; @@ -535,8 +531,7 @@ ubcmtp_configure(struct ubcmtp_softc *sc) hw->mt_slots = UBCMTP_MAX_FINGERS; hw->flags = WSMOUSEHW_MT_TRACKING; - return wsmouse_configure(sc->sc_wsmousedev, - ubcmtp_params, nitems(ubcmtp_params)); + return wsmouse_configure(sc->sc_wsmousedev, NULL, 0); } int diff --git a/sys/dev/wscons/wsmouseinput.h b/sys/dev/wscons/wsmouseinput.h index 2eeaa74fdf7..3f38fddfaa1 100644 --- a/sys/dev/wscons/wsmouseinput.h +++ b/sys/dev/wscons/wsmouseinput.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmouseinput.h,v 1.7 2017/05/08 20:55:29 bru Exp $ */ +/* $OpenBSD: wsmouseinput.h,v 1.8 2017/06/06 21:53:07 bru Exp $ */ /* * Copyright (c) 2015, 2016 Ulf Brosziewski @@ -163,9 +163,10 @@ struct wsmouseinput { #define CONFIGURED (1 << 18) /* filter.mode (bit 0-2: smoothing factor, bit 3: hysteresis type) */ +#define WEAK_HYSTERESIS 0 #define STRONG_HYSTERESIS (1 << 3) #define SMOOTHING_MASK 7 -#define FILTER_MODE_DEFAULT STRONG_HYSTERESIS +#define FILTER_MODE_DEFAULT WEAK_HYSTERESIS struct evq_access { struct wseventvar *evar; |