diff options
| author | Ulf Brosziewski <bru@cvs.openbsd.org> | 2017-06-18 13:21:49 +0000 |
|---|---|---|
| committer | Ulf Brosziewski <bru@cvs.openbsd.org> | 2017-06-18 13:21:49 +0000 |
| commit | 013e5a65dd76350359b0bce311e7ae5bbe63aaa5 (patch) | |
| tree | ac3cb8ad5bffba282f85d69937fae25198600d03 /sys/dev/wscons | |
| parent | 225a0f468ac558269da310055700f8f9743bcc4d (diff) | |
Remove remnants of old versions.
Diffstat (limited to 'sys/dev/wscons')
| -rw-r--r-- | sys/dev/wscons/wsmousevar.h | 5 | ||||
| -rw-r--r-- | sys/dev/wscons/wstpad.c | 14 |
2 files changed, 9 insertions, 10 deletions
diff --git a/sys/dev/wscons/wsmousevar.h b/sys/dev/wscons/wsmousevar.h index 24610767c2a..de4e0691730 100644 --- a/sys/dev/wscons/wsmousevar.h +++ b/sys/dev/wscons/wsmousevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmousevar.h,v 1.14 2017/03/06 09:53:01 mpi Exp $ */ +/* $OpenBSD: wsmousevar.h,v 1.15 2017/06/18 13:21:48 bru Exp $ */ /* $NetBSD: wsmousevar.h,v 1.4 2000/01/08 02:57:24 takemura Exp $ */ /* @@ -115,7 +115,8 @@ int wsmousedevprint(void *, const char *); * recognize multiple contacts can always pass 0 as contact count to * wsmouse_touch). */ -#define WSMOUSE_DEFAULT_PRESSURE -1 +/* Use a synaptics-compatible value. */ +#define WSMOUSE_DEFAULT_PRESSURE 45 struct device; diff --git a/sys/dev/wscons/wstpad.c b/sys/dev/wscons/wstpad.c index 829f118f0f7..aa158564f77 100644 --- a/sys/dev/wscons/wstpad.c +++ b/sys/dev/wscons/wstpad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wstpad.c,v 1.6 2017/06/06 19:47:22 bru Exp $ */ +/* $OpenBSD: wstpad.c,v 1.7 2017/06/18 13:21:48 bru Exp $ */ /* * Copyright (c) 2015, 2016 Ulf Brosziewski @@ -1152,13 +1152,11 @@ wstpad_compat_convert(struct wsmouseinput *input, struct evq_access *evq) wstpad_filter(input, &dx, &dy); - if (dx || dy) { - input->motion.dx = dx; - input->motion.dy = dy; - if ((dx || dy) && !(input->motion.sync & SYNC_DELTAS)) { - input->motion.dz = input->motion.dw = 0; - input->motion.sync |= SYNC_DELTAS; - } + input->motion.dx = dx; + input->motion.dy = dy; + if ((dx || dy) && !(input->motion.sync & SYNC_DELTAS)) { + input->motion.dz = input->motion.dw = 0; + input->motion.sync |= SYNC_DELTAS; } if (input->tp != NULL) |