| Message ID | 1313666888-18939-5-git-send-email-djkurtz@chromium.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On 08/18/2011 04:28 AM, Daniel Kurtz wrote: > Synaptics makes (at least) two kinds of touchpad sensors: > * Older pads use a profile sensor that could only infer the location > of individual fingers based on the projection of their profiles > onto row and column sensors. > * Newer pads use an image sensor that can track true finger position > using a two-dimensional sensor grid. > > Both sensor types support an "Advanced Gesture Mode": > When multiple fingers are detected, the touchpad sends alternating > "Advanced Gesture Mode" (AGM) and "Simple Gesture Mode" (SGM) > packets. > The AGM packets have w=2, and contain reduced resolution finger data > The SGM packets have w={0,1} and contain full resolution finger data > > Profile sensors try to report the "upper" (larger y value) finger in > the SGM packet, and the lower (smaller y value) in the AGM packet. > However, due to the nature of the profile sensor, they easily get > confused when fingers cross, and can start reporting the x-coordinate > of one with the y-coordinate of the other. Thus, for profile > sensors, "semi-mt" was created, which reports a "bounding box" > created by pairing min and max coordinates of the two pairs of > reported fingers. > > Image sensors can report the actual coordinates of two of the fingers > present. This patch detects if the touchpad is an image sensor and > reports finger data using the MT-B protocol. > > NOTE: This patch only adds partial support for 2-finger gestures. > The proper interpretation of the slot contents when more than > two fingers are present is left to later patches. Also, > handling of 'number of fingers' transitions is incomplete. > > Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Acked-by: Chase Douglas <chase.douglas@canonical.com> -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Aug 20, 2011 at 6:22 AM, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > Hi Daniel, > > On Thu, Aug 18, 2011 at 07:28:03PM +0800, Daniel Kurtz wrote: >> @@ -558,6 +626,11 @@ static void synaptics_process_packet(struct psmouse *psmouse) >> if (synaptics_parse_hw_state(psmouse->packet, priv, &hw)) >> return; >> >> + if (SYN_CAP_IMAGE_SENSOR(priv->ext_cap_0c)) { >> + synaptics_image_sensor_process(psmouse, &hw); >> + return; >> + } >> + > > So what about the rest of the SYnaptics processing (wheel, additional > buttons, etc)? Are we sure that touchpads with image sensors will never > implement them? > > -- > Dmitry > All image sensors that I am aware of are clickpads, with one button integrated under the pad, which is reported as the middle button. We could report right, middle, up, down, and ext_buttons (scroll is not possible, since w=2;buf[1] is used for x for devices that send agm packets). However, I have no way of knowing if this added complexity is necessary, nor any way of testing it. -Dan -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Aug 20, 2011 at 03:07:41PM +0800, Daniel Kurtz wrote: > On Sat, Aug 20, 2011 at 6:22 AM, Dmitry Torokhov > <dmitry.torokhov@gmail.com> wrote: > > Hi Daniel, > > > > On Thu, Aug 18, 2011 at 07:28:03PM +0800, Daniel Kurtz wrote: > >> @@ -558,6 +626,11 @@ static void synaptics_process_packet(struct psmouse *psmouse) > >> if (synaptics_parse_hw_state(psmouse->packet, priv, &hw)) > >> return; > >> > >> + if (SYN_CAP_IMAGE_SENSOR(priv->ext_cap_0c)) { > >> + synaptics_image_sensor_process(psmouse, &hw); > >> + return; > >> + } > >> + > > > > So what about the rest of the SYnaptics processing (wheel, additional > > buttons, etc)? Are we sure that touchpads with image sensors will never > > implement them? > > > > -- > > Dmitry > > > > All image sensors that I am aware of are clickpads, with one button > integrated under the pad, which is reported as the middle button. > > We could report right, middle, up, down, and ext_buttons (scroll is > not possible, since w=2;buf[1] is used for x for devices that send agm > packets). > However, I have no way of knowing if this added complexity is > necessary I would prefer us supporting full protocol so if some vendor does add additional buttons we have everything in place. > , nor any way of testing it. As long as your case still works I think it will be good enough. Thanks.
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 30d05fd..a49420f 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -304,7 +304,8 @@ static int synaptics_set_advanced_gesture_mode(struct psmouse *psmouse) static unsigned char param = 0xc8; struct synaptics_data *priv = psmouse->private; - if (!SYN_CAP_ADV_GESTURE(priv->ext_cap_0c)) + if (!(SYN_CAP_ADV_GESTURE(priv->ext_cap_0c) || + SYN_CAP_IMAGE_SENSOR(priv->ext_cap_0c))) return 0; if (psmouse_sliced_command(psmouse, SYN_QUE_MODEL)) @@ -463,7 +464,9 @@ static int synaptics_parse_hw_state(const unsigned char buf[], hw->down = ((buf[0] ^ buf[3]) & 0x02) ? 1 : 0; } - if (SYN_CAP_ADV_GESTURE(priv->ext_cap_0c) && hw->w == 2) { + if ((SYN_CAP_ADV_GESTURE(priv->ext_cap_0c) + || SYN_CAP_IMAGE_SENSOR(priv->ext_cap_0c)) + && hw->w == 2) { synaptics_parse_agm(buf, priv); return 1; } @@ -543,6 +546,71 @@ static void synaptics_report_semi_mt_data(struct input_dev *dev, } } +static void synaptics_report_slot(struct input_dev *dev, int slot, + const struct synaptics_hw_state *hw) +{ + input_mt_slot(dev, slot); + input_mt_report_slot_state(dev, MT_TOOL_FINGER, (hw != NULL)); + if (!hw) + return; + + input_report_abs(dev, ABS_MT_POSITION_X, hw->x); + input_report_abs(dev, ABS_MT_POSITION_Y, invert_y(hw->y)); + input_report_abs(dev, ABS_MT_PRESSURE, hw->z); +} + +static void synaptics_report_mt_data(struct psmouse *psmouse, + int count, + const struct synaptics_hw_state *sgm) +{ + struct input_dev *dev = psmouse->dev; + struct synaptics_data *priv = psmouse->private; + struct synaptics_hw_state *agm = &priv->agm; + + switch (count) { + case 0: + synaptics_report_slot(dev, 0, NULL); + synaptics_report_slot(dev, 1, NULL); + break; + case 1: + synaptics_report_slot(dev, 0, sgm); + synaptics_report_slot(dev, 1, NULL); + break; + case 2: + case 3: /* Fall-through case */ + synaptics_report_slot(dev, 0, sgm); + synaptics_report_slot(dev, 1, agm); + break; + } + + /* Don't use active slot count to generate BTN_TOOL events. */ + input_mt_report_pointer_emulation(dev, false); + + /* Send the number of fingers reported by touchpad itself. */ + input_mt_report_finger_count(dev, count); + + input_report_key(dev, BTN_LEFT, sgm->left); + input_sync(dev); +} + +static void synaptics_image_sensor_process(struct psmouse *psmouse, + struct synaptics_hw_state *sgm) +{ + int count; + + if (sgm->z == 0) + count = 0; + else if (sgm->w >= 4) + count = 1; + else if (sgm->w == 0) + count = 2; + else + count = 3; + + /* Send resulting input events to user space */ + synaptics_report_mt_data(psmouse, count, sgm); +} + /* * called for each full received packet from the touchpad */ @@ -558,6 +626,11 @@ static void synaptics_process_packet(struct psmouse *psmouse) if (synaptics_parse_hw_state(psmouse->packet, priv, &hw)) return; + if (SYN_CAP_IMAGE_SENSOR(priv->ext_cap_0c)) { + synaptics_image_sensor_process(psmouse, &hw); + return; + } + if (hw.scroll) { priv->scroll += hw.scroll; @@ -739,7 +812,14 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv) set_abs_position_params(dev, priv, ABS_X, ABS_Y); input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0); - if (SYN_CAP_ADV_GESTURE(priv->ext_cap_0c)) { + if (SYN_CAP_IMAGE_SENSOR(priv->ext_cap_0c)) { + input_mt_init_slots(dev, 2); + set_abs_position_params(dev, priv, ABS_MT_POSITION_X, + ABS_MT_POSITION_Y); + /* Image sensors can report per-contact pressure */ + input_set_abs_params(dev, ABS_MT_PRESSURE, 0, 255, 0, 0); + } else if (SYN_CAP_ADV_GESTURE(priv->ext_cap_0c)) { + /* Non-image sensors with AGM use semi-mt */ __set_bit(INPUT_PROP_SEMI_MT, dev->propbit); input_mt_init_slots(dev, 2); set_abs_position_params(dev, priv, ABS_MT_POSITION_X, diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h index a9efbf3..0ea7616 100644 --- a/drivers/input/mouse/synaptics.h +++ b/drivers/input/mouse/synaptics.h @@ -74,6 +74,8 @@ * 2 0x04 reduced filtering firmware does less filtering on * position data, driver should watch * for noise. + * 2 0x08 image sensor image sensor tracks 5 fingers, but only + * reports 2. * 2 0x20 report min query 0x0f gives min coord reported */ #define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100000) /* 1-button ClickPad */ @@ -82,6 +84,7 @@ #define SYN_CAP_MIN_DIMENSIONS(ex0c) ((ex0c) & 0x002000) #define SYN_CAP_ADV_GESTURE(ex0c) ((ex0c) & 0x080000) #define SYN_CAP_REDUCED_FILTERING(ex0c) ((ex0c) & 0x000400) +#define SYN_CAP_IMAGE_SENSOR(ex0c) ((ex0c) & 0x000800) /* synaptics modes query bits */ #define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7))
Synaptics makes (at least) two kinds of touchpad sensors: * Older pads use a profile sensor that could only infer the location of individual fingers based on the projection of their profiles onto row and column sensors. * Newer pads use an image sensor that can track true finger position using a two-dimensional sensor grid. Both sensor types support an "Advanced Gesture Mode": When multiple fingers are detected, the touchpad sends alternating "Advanced Gesture Mode" (AGM) and "Simple Gesture Mode" (SGM) packets. The AGM packets have w=2, and contain reduced resolution finger data The SGM packets have w={0,1} and contain full resolution finger data Profile sensors try to report the "upper" (larger y value) finger in the SGM packet, and the lower (smaller y value) in the AGM packet. However, due to the nature of the profile sensor, they easily get confused when fingers cross, and can start reporting the x-coordinate of one with the y-coordinate of the other. Thus, for profile sensors, "semi-mt" was created, which reports a "bounding box" created by pairing min and max coordinates of the two pairs of reported fingers. Image sensors can report the actual coordinates of two of the fingers present. This patch detects if the touchpad is an image sensor and reports finger data using the MT-B protocol. NOTE: This patch only adds partial support for 2-finger gestures. The proper interpretation of the slot contents when more than two fingers are present is left to later patches. Also, handling of 'number of fingers' transitions is incomplete. Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> --- drivers/input/mouse/synaptics.c | 86 +++++++++++++++++++++++++++++++++++++- drivers/input/mouse/synaptics.h | 3 + 2 files changed, 86 insertions(+), 3 deletions(-)