From ec55cf64cd65fa1b678cd6c1d30bfd1523431a03 Mon Sep 17 00:00:00 2001
From: bru <bru@openbsd.org>
Date: Sun, 18 Jun 2017 13:21:48 +0000
Subject: [PATCH] Remove remnants of old versions.

---
 sys/dev/wscons/wsmousevar.h |  5 +++--
 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)
-- 
2.20.1