summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2012-01-28 21:00:49 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2012-01-28 21:00:49 +0000
commitb2c01a83784e3445551223a43a3af5b097d568fa (patch)
tree6f9c772561c1991d0be3d1dcf2b3d02f536cb57a /sys/dev
parent393c43b7f662aee25cc3a298bd03a67ae0279b43 (diff)
Blacklist a dualpoint model which clitpad sends non compatible PS2 packets.
Issue reported by deraadt@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pckbc/pms.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/pckbc/pms.c b/sys/dev/pckbc/pms.c
index 19877f8f11e..a04386bb3aa 100644
--- a/sys/dev/pckbc/pms.c
+++ b/sys/dev/pckbc/pms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pms.c,v 1.26 2011/12/04 00:53:49 shadchin Exp $ */
+/* $OpenBSD: pms.c,v 1.27 2012/01/28 21:00:48 mpi Exp $ */
/* $NetBSD: psm.c,v 1.11 2000/06/05 22:20:57 sommerfeld Exp $ */
/*-
@@ -163,12 +163,18 @@ static const struct alps_model {
{ 0x6324, 0x8f, ALPS_GLIDEPOINT },
{ 0x6325, 0xef, ALPS_GLIDEPOINT },
{ 0x6326, 0xf8, ALPS_GLIDEPOINT },
- { 0x633b, 0xf8, ALPS_DUALPOINT | ALPS_PASSTHROUGH },
{ 0x7301, 0xf8, ALPS_DUALPOINT },
{ 0x7321, 0xf8, ALPS_GLIDEPOINT },
{ 0x7322, 0xf8, ALPS_GLIDEPOINT },
{ 0x7325, 0xcf, ALPS_GLIDEPOINT },
#if 0
+ /*
+ * This model has a clitpad sending almost compatible PS2
+ * packets but not compatible enough to be used with the
+ * ALPS protocol.
+ */
+ { 0x633b, 0xf8, ALPS_DUALPOINT | ALPS_PASSTHROUGH },
+
{ 0x7326, 0, 0 }, /* XXX Uses unknown v3 protocol */
#endif
};