diff options
| author | philip <philip@FreeBSD.org> | 2008-06-01 13:44:51 +0000 |
|---|---|---|
| committer | philip <philip@FreeBSD.org> | 2008-06-01 13:44:51 +0000 |
| commit | 9753f2182a914b83ed5a2c6a70a9d9f5b181f8f3 (patch) | |
| tree | 553d38fe53f286df1305aeb74ef0b51c50c8812b /sys/dev | |
| parent | 2b86a2d4de2912ac6e837f21fe15dd4e734fb001 (diff) | |
| download | FreeBSD-src-9753f2182a914b83ed5a2c6a70a9d9f5b181f8f3.zip FreeBSD-src-9753f2182a914b83ed5a2c6a70a9d9f5b181f8f3.tar.gz | |
Try to detect a Synaptics touchpad before IntelliMouse. Some touchpads will
pretend to be IntelliMouse (which have a few more features than generic mice)
causing the IntelliMouse probe to work and the Synaptics code never to be
called.
This should not break "real" IntelliMouse because the Synaptics detection code
is fairly specific.
PR: kern/120833
Submitted by: Eygene Ryabinkin <rea-fbsd -at- codelabs.ru>
MFC after: 1 week
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/atkbdc/psm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 2152818..03895a4 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -367,6 +367,8 @@ static struct { 0x08, MOUSE_4D_PACKETSIZE, enable_4dmouse }, { MOUSE_MODEL_4DPLUS, /* A4 Tech 4D+ Mouse */ 0xc8, MOUSE_4DPLUS_PACKETSIZE, enable_4dplus }, + { MOUSE_MODEL_SYNAPTICS, /* Synaptics Touchpad */ + 0xc0, MOUSE_SYNAPTICS_PACKETSIZE, enable_synaptics }, { MOUSE_MODEL_INTELLI, /* Microsoft IntelliMouse */ 0x08, MOUSE_PS2INTELLI_PACKETSIZE, enable_msintelli }, { MOUSE_MODEL_GLIDEPOINT, /* ALPS GlidePoint */ @@ -375,8 +377,6 @@ static struct { 0x80, MOUSE_PS2_PACKETSIZE, enable_kmouse }, { MOUSE_MODEL_VERSAPAD, /* Interlink electronics VersaPad */ 0xe8, MOUSE_PS2VERSA_PACKETSIZE, enable_versapad }, - { MOUSE_MODEL_SYNAPTICS, /* Synaptics Touchpad */ - 0xc0, MOUSE_SYNAPTICS_PACKETSIZE, enable_synaptics }, { MOUSE_MODEL_GENERIC, 0xc0, MOUSE_PS2_PACKETSIZE, NULL }, }; |
