On Tue, Dec 15, 2009 at 06:05:06PM -0700, Alex Chiang wrote:
> * Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>:
> >
> > The updated patch is below.
> >
> > --
> > Dmitry
>
> Should I test this one or wait one more iteration to address
> Takashi's last comments?
>
Actually I think we took the wrong direction with the original patch and
we should do what other buttonless devices (bcm5974) do: report touchpad
click as left button and have Synaptics X driver provide enhanced
support. This way we can have both modes (ClickZones and ClickButtons)
and users will get to chose (provided that someone takes time to add
that support to Synaptics driver of course ;) ).
Could you tell me if the below works for you?
--
Dmitry
Input: synaptics - add support for ClickPad devices
From: Takashi Iwai <tiwai@xxxxxxx>
The new device is a button-less "clickable" touchpad, it does not have
physical left, right nor middle buttons. Instead the entire touchpad
area can be "clicked" and such click is signalled the same way middle
button state is signalled on touchpads that have SYN_CAP_MIDDLE_BUTTON
capability.
The driver will reporting touchpad clicks as primary button (BTN_LEFT)
events, the same way driver for bcm5974 handles buttonless touchpads on
MacBooks, allowing limited support for legacy software. Enhanced support,
including "ClickButtons" and "ClickZone" modes to emulate right and
middle nuttons, is left to userspace components.
The device will not signal BTN_RIGHT event and will remove it from the
capability list. Since all Synaptics devices up until now had both left
and right buttons present the absence of BTN_RIGHT capability can be
used to identify ClickPad devices.
Due to the fact that there is no known capability bits for ClickPads we
are forced to match on product ID.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
---
drivers/input/mouse/synaptics.c | 21 ++++++++++++++++-----
drivers/input/mouse/synaptics.h | 2 ++
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 7047558..633b975 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -338,12 +338,16 @@ static void synaptics_parse_new_hw(unsigned char buf[],
((buf[0] & 0x04) >> 1) |
((buf[3] & 0x04) >> 2);
- hw->left = buf[0] & 0x01;
- hw->right = buf[0] & 0x02;
+ if (SYN_CAP_CLICKPAD(priv->ext_cap)) {
+ hw->left = (buf[0] ^ buf[3]) & 0x01;
+ } else {
+ hw->left = buf[0] & 0x01;
+ hw->right = buf[0] & 0x02;
- if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) {
- hw->middle = (buf[0] ^ buf[3]) & 0x01;
- hw->scroll = hw->w == 2 ? (signed char)buf[1] : 0;
+ if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) {
+ hw->middle = (buf[0] ^ buf[3]) & 0x01;
+ hw->scroll = hw->w == 2 ? (signed char)buf[1] : 0;
+ }
}
if (SYN_CAP_FOUR_BUTTON(priv->capabilities)) {
@@ -592,6 +596,13 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
__clear_bit(REL_X, dev->relbit);
__clear_bit(REL_Y, dev->relbit);
+ /*
+ * ClickPads are buttonless devices. We report the touchpad clicks
+ * as BTN_LEFT but there is no BTN_RIGHT or BTN_MIDDLE.
+ */
+ if (SYN_CAP_CLICKPAD(priv->ext_cap))
+ __clear_bit(BTN_RIGHT, dev->keybit);
+
dev->absres[ABS_X] = priv->x_res;
dev->absres[ABS_Y] = priv->y_res;
}
diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h
index 838e7f2..343dfc0 100644
--- a/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
@@ -48,6 +48,8 @@
#define SYN_CAP_VALID(c) ((((c) & 0x00ff00) >> 8) == 0x47)
#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(ec) (SYN_CAP_PRODUCT_ID(ec) == 0xe4)
/* synaptics modes query bits */
#define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7))
--
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
