From: Daniel Kurtz <djkurtz@chromium.org>
To: chase.douglas@canonical.com, dmitry.torokhov@gmail.com,
rydberg@euromail.se
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
olofj@chromium.org, chris@cnpbagwell.com,
Daniel Kurtz <djkurtz@chromium.org>
Subject: [PATCH 3/9 v4] Input: synaptics - refactor initialization of abs position axes
Date: Thu, 18 Aug 2011 19:28:02 +0800 [thread overview]
Message-ID: <1313666888-18939-4-git-send-email-djkurtz@chromium.org> (raw)
In-Reply-To: <1313666888-18939-1-git-send-email-djkurtz@chromium.org>
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
---
drivers/input/mouse/synaptics.c | 44 +++++++++++++++++---------------------
1 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index e966894..30d05fd 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -712,39 +712,38 @@ static psmouse_ret_t synaptics_process_byte(struct psmouse *psmouse)
/*****************************************************************************
* Driver initialization/cleanup functions
****************************************************************************/
+static void set_abs_position_params(struct input_dev *dev,
+ struct synaptics_data *priv, int x_code,
+ int y_code)
+{
+ int x_min = priv->x_min ?: XMIN_NOMINAL;
+ int x_max = priv->x_max ?: XMAX_NOMINAL;
+ int y_min = priv->y_min ?: YMIN_NOMINAL;
+ int y_max = priv->y_max ?: YMAX_NOMINAL;
+ int fuzz = SYN_CAP_REDUCED_FILTERING(priv->ext_cap_0c) ?
+ SYN_REDUCED_FILTER_FUZZ : 0;
+
+ input_set_abs_params(dev, x_code, x_min, x_max, fuzz, 0);
+ input_set_abs_params(dev, y_code, y_min, y_max, fuzz, 0);
+ input_abs_set_res(dev, x_code, priv->x_res);
+ input_abs_set_res(dev, y_code, priv->y_res);
+}
+
static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
{
int i;
- int fuzz = SYN_CAP_REDUCED_FILTERING(priv->ext_cap_0c) ?
- SYN_REDUCED_FILTER_FUZZ : 0;
__set_bit(INPUT_PROP_POINTER, dev->propbit);
__set_bit(EV_ABS, dev->evbit);
- input_set_abs_params(dev, ABS_X,
- priv->x_min ?: XMIN_NOMINAL,
- priv->x_max ?: XMAX_NOMINAL,
- fuzz, 0);
- input_set_abs_params(dev, ABS_Y,
- priv->y_min ?: YMIN_NOMINAL,
- priv->y_max ?: YMAX_NOMINAL,
- fuzz, 0);
+ 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)) {
__set_bit(INPUT_PROP_SEMI_MT, dev->propbit);
input_mt_init_slots(dev, 2);
- input_set_abs_params(dev, ABS_MT_POSITION_X,
- priv->x_min ?: XMIN_NOMINAL,
- priv->x_max ?: XMAX_NOMINAL,
- fuzz, 0);
- input_set_abs_params(dev, ABS_MT_POSITION_Y,
- priv->y_min ?: YMIN_NOMINAL,
- priv->y_max ?: YMAX_NOMINAL,
- fuzz, 0);
-
- input_abs_set_res(dev, ABS_MT_POSITION_X, priv->x_res);
- input_abs_set_res(dev, ABS_MT_POSITION_Y, priv->y_res);
+ set_abs_position_params(dev, priv, ABS_MT_POSITION_X,
+ ABS_MT_POSITION_Y);
}
if (SYN_CAP_PALMDETECT(priv->capabilities))
@@ -777,9 +776,6 @@ 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);
- input_abs_set_res(dev, ABS_X, priv->x_res);
- input_abs_set_res(dev, ABS_Y, priv->y_res);
-
if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
__set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
/* Clickpads report only left button */
--
1.7.3.1
next prev parent reply other threads:[~2011-08-18 11:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-18 11:27 [PATCH 0/9 v4] Synaptics image sensor support Daniel Kurtz
2011-08-18 11:28 ` [PATCH 1/9 v4] Input: synaptics - refactor y inversion Daniel Kurtz
2011-08-18 11:28 ` [PATCH 2/9 v4] Input: synaptics - refactor agm packet parsing Daniel Kurtz
2011-08-18 11:28 ` Daniel Kurtz [this message]
2011-08-18 11:28 ` [PATCH 4/9 v4] Input: synaptics - add image sensor support Daniel Kurtz
2011-08-18 16:00 ` Chase Douglas
2011-08-19 22:22 ` Dmitry Torokhov
2011-08-20 7:07 ` Daniel Kurtz
2011-08-20 7:07 ` Daniel Kurtz
2011-08-22 4:28 ` Dmitry Torokhov
2011-08-22 4:28 ` Dmitry Torokhov
2011-08-18 11:28 ` [PATCH 5/9 v4] Input: synaptics - decode AGM packet types Daniel Kurtz
2011-08-18 11:28 ` [PATCH 6/9 v4] Input: mt - document devices reporting more touches than slots Daniel Kurtz
2011-08-18 16:01 ` Chase Douglas
2011-08-18 11:28 ` [PATCH 7/9 v4] Input: synaptics - process finger (<=3) transitions Daniel Kurtz
2011-08-18 16:02 ` Chase Douglas
2011-08-18 11:28 ` [PATCH 8/9 v4] Input: add BTN_TOOL_QUINTTAP for reporting 5 fingers on touchpad Daniel Kurtz
2011-08-18 11:28 ` [PATCH 9/9 v4] Input: synaptics - process finger (<=5) transitions Daniel Kurtz
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=1313666888-18939-4-git-send-email-djkurtz@chromium.org \
--to=djkurtz@chromium.org \
--cc=chase.douglas@canonical.com \
--cc=chris@cnpbagwell.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olofj@chromium.org \
--cc=rydberg@euromail.se \
/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.