This is for kernel bug #18122 and MeeGo bug #4807, version 2. Lenovo S10-3t's ClickPad is a 2-button ClickPad that reports BTN_LEFT and BTN_RIGHT as normal touchpad, unlike the 1-button ClickPad used in HP mini 210 that reports solely BTN_MIDDLE. Of c0-cap response, the 1-button ClickPad has the 20-bit set while 2-button ClickPad has the 8-bit set. This patch makes the kernel only handle 1-button ClickPad specially, and treat 2-button ClickPad as same as other normal touchpads. Signed-off-by: Yan Li <yan.i.li@xxxxxxxxx> --- drivers/input/mouse/synaptics.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h index 613a365..20468b6 100644 --- a/drivers/input/mouse/synaptics.h +++ b/drivers/input/mouse/synaptics.h @@ -51,7 +51,13 @@ #define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20) #define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12) #define SYN_CAP_PRODUCT_ID(ec) (((ec) & 0xff0000) >> 16) -#define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100100) +/* This macro detects 1-button ClickPad. Of ex0c capacity, if the + * 20-bit of ex0c is set the touchpad is a 1-button ClickPad, which + * needs special handling because it reports only BTN_MIDDLE. If the + * 8-bit is set it is a 2-button ClickPad which reports BTN_* events + * normally and needs no special handling. Therefore this macro + * detects 1-button ClickPad only. */ +#define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100000) #define SYN_CAP_MAX_DIMENSIONS(ex0c) ((ex0c) & 0x020000) /* synaptics modes query bits */ -- 1.7.2.3 -- Best regards, Li, Yan MeeGo Team, Opensource Technology Center, SSG, Intel Office tel.: +86-10-82171695 (inet: 8-758-1695) OpenPGP key: 5C6C31EF IRC: yanli on network irc.freenode.net -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
