From: "Henrik Rydberg" <rydberg@euromail.se>
To: Ping Cheng <pinglinux@gmail.com>
Cc: Ping Cheng <pingc@wacom.com>, linux-input@vger.kernel.org
Subject: Re: [PATCH 1/2] input: wacom - Prepare for syncing with input-mt changes
Date: Tue, 4 Dec 2012 17:10:21 +0100 [thread overview]
Message-ID: <20121204161021.GA1427@polaris.bitmath.org> (raw)
In-Reply-To: <1354570740-2313-1-git-send-email-pingc@wacom.com>
Hi Ping,
> Henrik added new MT routines in release 3.7. This patch is to prepare
> for the use of new MT routines.
>
> Signed-off-by: Ping Cheng <pingc@wacom.com>
> ---
> drivers/input/tablet/wacom_wac.c | 85 ++++++++++++++++++++------------------
> 1 file changed, 45 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
> index c0f3e91..097b559 100644
> --- a/drivers/input/tablet/wacom_wac.c
> +++ b/drivers/input/tablet/wacom_wac.c
> @@ -1444,39 +1444,64 @@ static unsigned int wacom_calculate_touch_res(unsigned int logical_max,
> return (logical_max * 100) / physical_max;
> }
>
> -int wacom_setup_input_capabilities(struct input_dev *input_dev,
> - struct wacom_wac *wacom_wac)
> +static void wacom_abs_set_axis(struct input_dev *input_dev,
> + struct wacom_wac *wacom_wac)
> {
> struct wacom_features *features = &wacom_wac->features;
> - int i;
> -
> - input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
> -
> - __set_bit(BTN_TOUCH, input_dev->keybit);
> -
> - input_set_abs_params(input_dev, ABS_X, 0, features->x_max,
> - features->x_fuzz, 0);
> - input_set_abs_params(input_dev, ABS_Y, 0, features->y_max,
> - features->y_fuzz, 0);
>
> if (features->device_type == BTN_TOOL_PEN) {
> - input_set_abs_params(input_dev, ABS_PRESSURE, 0, features->pressure_max,
> - features->pressure_fuzz, 0);
> + input_set_abs_params(input_dev, ABS_X, 0, features->x_max,
> + features->x_fuzz, 0);
> + input_set_abs_params(input_dev, ABS_Y, 0, features->y_max,
> + features->y_fuzz, 0);
> + input_set_abs_params(input_dev, ABS_PRESSURE, 0,
> + features->pressure_max, features->pressure_fuzz, 0);
>
> /* penabled devices have fixed resolution for each model */
> input_abs_set_res(input_dev, ABS_X, features->x_resolution);
> input_abs_set_res(input_dev, ABS_Y, features->y_resolution);
> } else {
> - input_abs_set_res(input_dev, ABS_X,
> - wacom_calculate_touch_res(features->x_max,
> - features->x_phy));
> - input_abs_set_res(input_dev, ABS_Y,
> - wacom_calculate_touch_res(features->y_max,
> - features->y_phy));
> + if (features->touch_max <= 2) {
> + input_set_abs_params(input_dev, ABS_X, 0,
> + features->x_max, features->x_fuzz, 0);
> + input_set_abs_params(input_dev, ABS_Y, 0,
> + features->y_max, features->y_fuzz, 0);
> + input_abs_set_res(input_dev, ABS_X,
> + wacom_calculate_touch_res(features->x_max,
> + features->x_phy));
> + input_abs_set_res(input_dev, ABS_Y,
> + wacom_calculate_touch_res(features->y_max,
> + features->y_phy));
> + }
> +
> + if (features->touch_max > 1) {
> + input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0,
> + features->x_max, features->x_fuzz, 0);
> + input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0,
> + features->y_max, features->y_fuzz, 0);
> + input_abs_set_res(input_dev, ABS_MT_POSITION_X,
> + wacom_calculate_touch_res(features->x_max,
> + features->x_phy));
> + input_abs_set_res(input_dev, ABS_MT_POSITION_Y,
> + wacom_calculate_touch_res(features->y_max,
> + features->y_phy));
> + }
So the (touch_max > 1) logic replaces the branching on features and device type?
> }
> +}
>
> +int wacom_setup_input_capabilities(struct input_dev *input_dev,
> + struct wacom_wac *wacom_wac)
> +{
> + struct wacom_features *features = &wacom_wac->features;
> + int i;
> +
> + input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
> +
> + __set_bit(BTN_TOUCH, input_dev->keybit);
> __set_bit(ABS_MISC, input_dev->absbit);
>
> + wacom_abs_set_axis(input_dev, wacom_wac);
> +
> switch (wacom_wac->features.type) {
> case WACOM_MO:
> input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
> @@ -1625,13 +1650,6 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
> 0, features->x_max, 0, 0);
> input_set_abs_params(input_dev, ABS_MT_TOUCH_MINOR,
> 0, features->y_max, 0, 0);
> -
> - input_set_abs_params(input_dev, ABS_MT_POSITION_X,
> - 0, features->x_max,
> - features->x_fuzz, 0);
> - input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
> - 0, features->y_max,
> - features->y_fuzz, 0);
> }
> break;
>
> @@ -1677,12 +1695,6 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
> case TABLETPC2FG:
> if (features->device_type == BTN_TOOL_FINGER) {
> input_mt_init_slots(input_dev, features->touch_max, 0);
> - input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE,
> - 0, MT_TOOL_MAX, 0, 0);
> - input_set_abs_params(input_dev, ABS_MT_POSITION_X,
> - 0, features->x_max, 0, 0);
> - input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
> - 0, features->y_max, 0, 0);
> }
> /* fall through */
>
> @@ -1747,13 +1759,6 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
> ABS_MT_TOUCH_MINOR,
> 0, features->y_max, 0, 0);
> }
> -
> - input_set_abs_params(input_dev, ABS_MT_POSITION_X,
> - 0, features->x_max,
> - features->x_fuzz, 0);
> - input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
> - 0, features->y_max,
> - features->y_fuzz, 0);
> } else if (features->device_type == BTN_TOOL_PEN) {
> __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
> __set_bit(BTN_TOOL_PEN, input_dev->keybit);
> --
> 1.7.10.4
>
Thanks,
Henrik
next parent reply other threads:[~2012-12-04 16:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1354570740-2313-1-git-send-email-pingc@wacom.com>
2012-12-04 16:10 ` Henrik Rydberg [this message]
2012-12-04 17:58 ` [PATCH 1/2] input: wacom - Prepare for syncing with input-mt changes Ping Cheng
2012-12-04 18:54 ` Henrik Rydberg
2012-12-05 2:43 Ping Cheng
2012-12-05 20:18 ` Henrik Rydberg
-- strict thread matches above, loose matches on Subject: below --
2012-12-01 0:21 Ping Cheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121204161021.GA1427@polaris.bitmath.org \
--to=rydberg@euromail.se \
--cc=linux-input@vger.kernel.org \
--cc=pingc@wacom.com \
--cc=pinglinux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.