summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCasper Dik <casper.dik@oracle.com>2011-09-02 10:32:50 -0700
committerPeter Hutterer <peter.hutterer@who-t.net>2011-09-21 16:07:32 +1000
commitba981e223ae4449b08ff972b69220d435a735075 (patch)
treef41d40c6537a93b8e72093f0e617c8deaf0dff40
parentbc789cc7a057357e27faf1c6727dc95f6d02fcea (diff)
Extra buttons on Acer Ferrari 4000 laptop touchpad are not recognized
The code was checking for a value of exactly 1, while the Synaptics docs at http://www.synaptics.com/sites/default/files/511-000275-01rA.pdf say: Extended Model ID. This query returns the product ID, additional capability bits, and additional bits to widen the infoSensor field. infoSensor is a part of the Model ID query (query $03). The Extended Model ID query is only present if nExtendedQueries is *greater than* or equal to 1. Signed-off-by: Casper Dik <casper.dik@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/ps2comm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ps2comm.h b/src/ps2comm.h
index 0f3795c..1b303ca 100644
--- a/src/ps2comm.h
+++ b/src/ps2comm.h
@@ -74,7 +74,7 @@
#define SYN_CAP_MULTIFINGER(synhw) ((synhw)->capabilities & (1 << 1))
#define SYN_CAP_PALMDETECT(synhw) ((synhw)->capabilities & (1 << 0))
#define SYN_CAP_VALID(synhw) ((((synhw)->capabilities & 0x00ff00) >> 8) == 0x47)
-#define SYN_EXT_CAP_REQUESTS(synhw) (((synhw)->capabilities & 0x700000) == 0x100000)
+#define SYN_EXT_CAP_REQUESTS(synhw) (((synhw)->capabilities & 0x700000) != 0)
#define SYN_CAP_MULTI_BUTTON_NO(synhw) (((synhw)->ext_cap & 0x00f000) >> 12)
/* synaptics modes query bits */