Hi Hans,
On Tue, Jul 29, 2014 at 10:07:32AM +0200, Hans de Goede wrote:
> Add support for querying the physical size from the touchpad for rushmore
> and v7 touchpads, and use that to tell userspace the device resolution.
>
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> ---
> drivers/input/mouse/alps.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++
> drivers/input/mouse/alps.h | 2 ++
> 2 files changed, 50 insertions(+)
>
> diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> index ac9fdbd..1531387 100644
> --- a/drivers/input/mouse/alps.c
> +++ b/drivers/input/mouse/alps.c
> @@ -1783,6 +1783,45 @@ error:
> return -1;
> }
>
> +static int alps_get_v3_v7_resolution(struct psmouse *psmouse, int reg_pitch)
> +{
> + int reg, x_pitch, y_pitch, x_electrode, y_electrode, x_phys, y_phys;
> + struct alps_data *priv = psmouse->private;
> +
> + reg = alps_command_mode_read_reg(psmouse, reg_pitch);
> + if (reg < 0)
> + return reg;
> +
> + x_pitch = (char)(reg << 4) >> 4; /* sign extend lower 4 bits */
> + x_pitch = 50 + 2 * x_pitch; /* In 0.1 mm units */
> +
> + y_pitch = (char)reg >> 4; /* sign extend upper 4 bits */
> + y_pitch = 36 + 2 * y_pitch; /* In 0.1 mm units */
> +
> + reg = alps_command_mode_read_reg(psmouse, reg_pitch + 1);
> + if (reg < 0)
> + return reg;
> +
> + x_electrode = (char)(reg << 4) >> 4; /* sign extend lower 4 bits */
> + x_electrode = 17 + x_electrode;
> +
> + y_electrode = (char)reg >> 4; /* sign extend upper 4 bits */
> + y_electrode = 13 + y_electrode;
> +
> + x_phys = x_pitch * (x_electrode - 1); /* In 0.1 mm units */
> + y_phys = y_pitch * (y_electrode - 1); /* In 0.1 mm units */
> +
> + priv->x_res = priv->x_max * 10 / x_phys; /* units / mm */
> + priv->y_res = priv->y_max * 10 / y_phys; /* units / mm */
> +
> + psmouse_info(psmouse,
> + "alps: pitch %dx%d num-electrodes %dx%d physical size %dx%d mm res %dx%d\n",
> + x_pitch, y_pitch, x_electrode, y_electrode,
> + x_phys / 10, y_phys / 10, priv->x_res, priv->y_res);
I changed it to psmouse_dbg and applied.
Thanks.
--
Dmitry
--
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
