Message ID | 1291890794-3319-2-git-send-email-manoj.iyer@canonical.com |
---|---|
State | Accepted |
Headers | show |
Looks reasonable for SRU. Without having looked at the bug report or code, is this something that may be wanted/applicable for Lucid? -Stefan On 12/09/2010 11:33 AM, Manoj Iyer wrote: > From: Yan Li <yan.i.li@intel.com> > > 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. > > In 0xc0-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 in the same fashion as regular touchpads. > > This fixes kernel bug #18122 and MeeGo bug #4807. > > Signed-off-by: Yan Li <yan.i.li@intel.com> > Signed-off-by: Dmitry Torokhov <dtor@mail.ru> > (cherry picked from commit 3bfa321e662edf90fb8123a02c987c2965fa50bb) > > Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Acked-By: Stefan Bader <stefan.bader@canonical.com> > > BugLink: http://launchpad.net/bugs/687750 > --- > drivers/input/mouse/synaptics.h | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h > index 80907d0..63fb598 100644 > --- a/drivers/input/mouse/synaptics.h > +++ b/drivers/input/mouse/synaptics.h > @@ -51,7 +51,8 @@ > #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) > +#define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100000) /* 1-button ClickPad */ > +#define SYN_CAP_CLICKPAD2BTN(ex0c) ((ex0c) & 0x000100) /* 2-button ClickPad */ > #define SYN_CAP_MAX_DIMENSIONS(ex0c) ((ex0c) & 0x020000) > > /* synaptics modes query bits */
On 12/09/2010 03:57 AM, Stefan Bader wrote: > Looks reasonable for SRU. Without having looked at the bug report or code, is > this something that may be wanted/applicable for Lucid? > Looks like the code in 2.6.32 is quite different. rtg
submitted patch to stable@kernel.org On Thu, Dec 9, 2010 at 2:03 PM, Tim Gardner <tim.gardner@canonical.com> wrote: > On 12/09/2010 03:57 AM, Stefan Bader wrote: >> Looks reasonable for SRU. Without having looked at the bug report or code, is >> this something that may be wanted/applicable for Lucid? >> > > Looks like the code in 2.6.32 is quite different. > > rtg > -- > Tim Gardner tim.gardner@canonical.com > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team >
diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h index 80907d0..63fb598 100644 --- a/drivers/input/mouse/synaptics.h +++ b/drivers/input/mouse/synaptics.h @@ -51,7 +51,8 @@ #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) +#define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100000) /* 1-button ClickPad */ +#define SYN_CAP_CLICKPAD2BTN(ex0c) ((ex0c) & 0x000100) /* 2-button ClickPad */ #define SYN_CAP_MAX_DIMENSIONS(ex0c) ((ex0c) & 0x020000) /* synaptics modes query bits */