summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2013-04-15 09:12:42 +0000
committermpi <mpi@openbsd.org>2013-04-15 09:12:42 +0000
commit1a2228f99fadf9cf4e7cf280f27afa5afaf71484 (patch)
tree6aef2ce950ad16d26641e68cc1db4ddfee73d463
parentDon't probe for all supported protocols this can confuse some touchpads and (diff)
downloadwireguard-openbsd-1a2228f99fadf9cf4e7cf280f27afa5afaf71484.tar.xz
wireguard-openbsd-1a2228f99fadf9cf4e7cf280f27afa5afaf71484.zip
Move the IntelliMouse protocol definition after Elantech ones, because some
touchpads support both of them and we want to pick the latter. Reported by Peter J. Philipp, thanks.
-rw-r--r--sys/dev/pckbc/pms.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/pckbc/pms.c b/sys/dev/pckbc/pms.c
index 6734a1e9072..d8563d6d23a 100644
--- a/sys/dev/pckbc/pms.c
+++ b/sys/dev/pckbc/pms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pms.c,v 1.38 2013/04/15 09:09:50 mpi Exp $ */
+/* $OpenBSD: pms.c,v 1.39 2013/04/15 09:12:42 mpi Exp $ */
/* $NetBSD: psm.c,v 1.11 2000/06/05 22:20:57 sommerfeld Exp $ */
/*-
@@ -314,15 +314,6 @@ const struct pms_protocol pms_protocols[] = {
pms_proc_mouse,
NULL
},
- /* Microsoft IntelliMouse */
- {
- PMS_INTELLI, 4,
- pms_enable_intelli,
- pms_ioctl_mouse,
- pms_sync_mouse,
- pms_proc_mouse,
- NULL
- },
/* Synaptics touchpad */
{
PMS_SYNAPTICS, 6,
@@ -368,6 +359,15 @@ const struct pms_protocol pms_protocols[] = {
pms_proc_elantech_v3,
NULL
},
+ /* Microsoft IntelliMouse */
+ {
+ PMS_INTELLI, 4,
+ pms_enable_intelli,
+ pms_ioctl_mouse,
+ pms_sync_mouse,
+ pms_proc_mouse,
+ NULL
+ },
};
int