diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-03-26 01:30:23 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-03-26 01:30:23 +0000 |
| commit | 48729bf69dcd4670ba8aee95f240b5d27e29772a (patch) | |
| tree | ff97f6633ad796ae1964230a0bcd2a33f35c8632 /sys/dev/acpi/acpi.c | |
| parent | 460ab578443f59ae1e9050049235ddee1dcbd9c9 (diff) | |
Use the 0x10 extended capability to determine if the trackstick
buttons are wired to the trackpad and need to be re-routed to the
trackstick. Without this change the buttons on 2015 thinkpads
get picked up as extended buttons that show up as scroll up/down.
Remove the X1 Carbon 2015 (LEN0048) and X250 (LEN0046) from the
top button area/soft buttons quirks list. Also avoid using the
quirk list entirely if the capability bit is set.
Based on work from jcs@ with feedback from mpi@
ok mpi@ jcs@
Diffstat (limited to 'sys/dev/acpi/acpi.c')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index bb429a085ed..c55c6f6413c 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.286 2015/03/20 20:25:10 kettenis Exp $ */ +/* $OpenBSD: acpi.c,v 1.287 2015/03/26 01:30:22 jsg Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -183,9 +183,7 @@ static const char *sbtn_pnp[] = { "LEN0041", "LEN0042", "LEN0045", - "LEN0046", "LEN0047", - "LEN0048", "LEN0049", "LEN2000", "LEN2001", |