summaryrefslogtreecommitdiff
path: root/sys/dev/pckbc/pms.c
diff options
context:
space:
mode:
authorjoshua stein <jcs@cvs.openbsd.org>2013-06-28 18:32:02 +0000
committerjoshua stein <jcs@cvs.openbsd.org>2013-06-28 18:32:02 +0000
commit29e8872c7d2c8d58ce948db32e82c7b9befa386a (patch)
treefafd32fce936da924148cf482d00ac0ff1878381 /sys/dev/pckbc/pms.c
parente0e744e6d3fb97c2ec27132ef6994c5033f96be9 (diff)
send proper z value to elantech_send_input in previous v4 commit
pointed out by Owain G. Ainsworth
Diffstat (limited to 'sys/dev/pckbc/pms.c')
-rw-r--r--sys/dev/pckbc/pms.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pckbc/pms.c b/sys/dev/pckbc/pms.c
index 0a717082042..3893b602902 100644
--- a/sys/dev/pckbc/pms.c
+++ b/sys/dev/pckbc/pms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pms.c,v 1.43 2013/05/31 19:21:09 jcs Exp $ */
+/* $OpenBSD: pms.c,v 1.44 2013/06/28 18:32:01 jcs Exp $ */
/* $NetBSD: psm.c,v 1.11 2000/06/05 22:20:57 sommerfeld Exp $ */
/*-
@@ -2195,7 +2195,7 @@ void
pms_proc_elantech_v4(struct pms_softc *sc)
{
struct elantech_softc *elantech = sc->elantech;
- int w, z, delta_x1 = 0, delta_x2 = 0, delta_y1 = 0, delta_y2 = 0;
+ int z, delta_x1 = 0, delta_x2 = 0, delta_y1 = 0, delta_y2 = 0;
int i, weight, finger, fingers = 0, id, sid;
switch (sc->packet[3] & 0x1f) {
@@ -2254,15 +2254,15 @@ pms_proc_elantech_v4(struct pms_softc *sc)
fingers++;
elantech_send_input(sc, elantech->mt[id].x, elantech->mt[id].y,
- z, fingers);
+ 1, fingers);
if (sid >= 0) {
- elantech->mt[sid].x += delta_x2 * w;
- elantech->mt[sid].y -= delta_y2 * w;
+ elantech->mt[sid].x += delta_x2 * weight;
+ elantech->mt[sid].y -= delta_y2 * weight;
/* XXX: can only send one finger of input */
/*
elantech_send_input(sc, elantech->mt[sid].x,
- elantech->mt[sid].y, z, w);
+ elantech->mt[sid].y, 1, fingers);
*/
}