From 5103af7e719043f8d3910dfa8027f8475a693f1e Mon Sep 17 00:00:00 2001 From: stsp Date: Mon, 8 Jun 2015 06:39:22 +0000 Subject: [PATCH] pms(4): Don't match Elantech v4 devices with firmware versions 0xX7XXXX. Apparently we don't support these touchpads properly so leave them in PS/2 compat mode. Regression reported by Remi Locherer on bugs@. And stop matching devices with firmware versions higher than 0xX8XXXX since we cannot be sure they work. ok mpi@ --- sys/dev/pckbc/pms.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/pckbc/pms.c b/sys/dev/pckbc/pms.c index 2e7e6e3e4f2..e26cf5cddad 100644 --- a/sys/dev/pckbc/pms.c +++ b/sys/dev/pckbc/pms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pms.c,v 1.61 2015/05/25 15:04:26 mpi Exp $ */ +/* $OpenBSD: pms.c,v 1.62 2015/06/08 06:39:22 stsp Exp $ */ /* $NetBSD: psm.c,v 1.11 2000/06/05 22:20:57 sommerfeld Exp $ */ /*- @@ -1840,7 +1840,8 @@ elantech_get_hwinfo_v4(struct pms_softc *sc) if (synaptics_query(sc, ELANTECH_QUE_FW_VER, &fw_version)) return (-1); - if (((fw_version & 0x0f0000) >> 16) < 6) + if (((fw_version & 0x0f0000) >> 16) != 6 && + (fw_version & 0x0f0000) >> 16 != 8) return (-1); elantech->fw_version = fw_version; -- 2.20.1