From: Ben Gamari <ben@smart-cactus.org>
To: Ben Gamari <ben@smart-cactus.org>,
linux-input@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>,
Allen Hung <Allen_Hung@dell.com>,
Masaki Ota <masaki.ota@jp.alps.com>,
Ben Morgan <Ben_Morgan@dell.com>
Subject: [PATCH 3/5] input/alps: Allow touchsticks to report pressure
Date: Tue, 21 Jun 2016 11:19:31 +0200 [thread overview]
Message-ID: <1466500773-3470-4-git-send-email-ben@smart-cactus.org> (raw)
In-Reply-To: <1466500773-3470-1-git-send-email-ben@smart-cactus.org>
The SS5 hardware can report this.
---
drivers/input/mouse/alps.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 7874f4f..25d2cad 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -103,6 +103,7 @@ static const struct alps_nibble_commands alps_v6_nibble_commands[] = {
6-byte ALPS packet */
#define ALPS_STICK_BITS 0x100 /* separate stick button bits */
#define ALPS_BUTTONPAD 0x200 /* device is a clickpad */
+#define ALPS_DUALPOINT_WITH_PRESSURE 0x400 /* device can report trackpoint pressure */
static const struct alps_model_info alps_model_data[] = {
{ { 0x32, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT } }, /* Toshiba Salellite Pro M10 */
@@ -1270,9 +1271,11 @@ static int alps_decode_ss4_v2(struct alps_fields *f,
} else {
int x = (s8)(((p[0] & 1) << 7) | (p[1] & 0x7f));
int y = (s8)(((p[3] & 1) << 7) | (p[2] & 0x7f));
+ int pressure = (s8)(p[4] & 0x7f);
input_report_rel(priv->dev2, REL_X, x);
input_report_rel(priv->dev2, REL_Y, -y);
+ input_report_abs(priv->dev2, ABS_PRESSURE, pressure);
}
break;
@@ -2996,6 +2999,10 @@ int alps_init(struct psmouse *psmouse)
input_set_capability(dev2, EV_REL, REL_X);
input_set_capability(dev2, EV_REL, REL_Y);
+ if (priv->flags & ALPS_DUALPOINT_WITH_PRESSURE) {
+ input_set_capability(dev2, EV_ABS, ABS_PRESSURE);
+ input_set_abs_params(dev2, ABS_PRESSURE, 0, 127, 0, 0);
+ }
input_set_capability(dev2, EV_KEY, BTN_LEFT);
input_set_capability(dev2, EV_KEY, BTN_RIGHT);
input_set_capability(dev2, EV_KEY, BTN_MIDDLE);
--
2.8.1
next prev parent reply other threads:[~2016-06-21 9:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-21 9:19 [PATCH v3] Support for Alps SS5 touchpad Ben Gamari
2016-06-21 9:19 ` [PATCH 1/5] input/alps: Add touchstick support for SS5 hardware Ben Gamari
2016-06-21 9:19 ` [PATCH 2/5] input/alps: Handle 0-pressure 1F events Ben Gamari
2016-06-21 9:19 ` Ben Gamari [this message]
2016-06-21 9:19 ` [PATCH 4/5] input/alps: Set DualPoint flag for 74 03 28 devices Ben Gamari
2016-06-21 9:19 ` [PATCH 5/5] Documentation/alps: Add V8 protocol documentation Ben Gamari
2016-07-29 8:46 ` [PATCH v3] Support for Alps SS5 touchpad Jiri Kosina
2016-08-29 7:14 ` Michal Hocko
2016-10-03 7:23 ` Jiri Kosina
2016-10-03 12:15 ` Ben Gamari
2016-10-03 12:14 ` Ben Gamari
-- strict thread matches above, loose matches on Subject: below --
2016-10-03 12:16 [PATCH 1/5] input/alps: Add touchstick support for SS5 hardware Ben Gamari
2016-10-03 12:16 ` [PATCH 3/5] input/alps: Allow touchsticks to report pressure Ben Gamari
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=1466500773-3470-4-git-send-email-ben@smart-cactus.org \
--to=ben@smart-cactus.org \
--cc=Allen_Hung@dell.com \
--cc=Ben_Morgan@dell.com \
--cc=hdegoede@redhat.com \
--cc=linux-input@vger.kernel.org \
--cc=masaki.ota@jp.alps.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).