From: "Pali Rohár" <pali.rohar@gmail.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Hans de Goede <hdegoede@redhat.com>,
Ben Gamari <ben@smart-cactus.org>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
"Pali Rohár" <pali.rohar@gmail.com>
Subject: [PATCH 1/5] Input: alps - move ALPS_PROTO_V6 out of alps_model_data table
Date: Mon, 6 Jun 2016 13:23:57 +0200 [thread overview]
Message-ID: <1465212241-14702-2-git-send-email-pali.rohar@gmail.com> (raw)
In-Reply-To: <1465212241-14702-1-git-send-email-pali.rohar@gmail.com>
Like for other protocols create alps_v6_protocol_data and use it in
alps_identify() function.
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
drivers/input/mouse/alps.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 936f07a..eb0c57b 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -133,7 +133,6 @@ static const struct alps_model_info alps_model_data[] = {
/* Dell Latitude E5500, E6400, E6500, Precision M4400 */
{ { 0x62, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xcf, 0xcf,
ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED } },
- { { 0x73, 0x00, 0x14 }, 0x00, { ALPS_PROTO_V6, 0xff, 0xff, ALPS_DUALPOINT } }, /* Dell XT2 */
{ { 0x73, 0x02, 0x50 }, 0x00, { ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_FOUR_BUTTONS } }, /* Dell Vostro 1400 */
{ { 0x52, 0x01, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xff, 0xff,
ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED } }, /* Toshiba Tecra A11-11L */
@@ -152,6 +151,10 @@ static const struct alps_protocol_info alps_v5_protocol_data = {
ALPS_PROTO_V5, 0xc8, 0xd8, 0
};
+static const struct alps_protocol_info alps_v6_protocol_data = {
+ ALPS_PROTO_V6, 0xff, 0xff, ALPS_DUALPOINT
+};
+
static const struct alps_protocol_info alps_v7_protocol_data = {
ALPS_PROTO_V7, 0x48, 0x48, ALPS_DUALPOINT
};
@@ -2756,6 +2759,8 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv)
if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0x50 &&
ec[0] == 0x73 && (ec[1] == 0x01 || ec[1] == 0x02)) {
protocol = &alps_v5_protocol_data;
+ } else if (e7[0] == 0x73 && e7[1] == 0x00 && e7[2] == 0x14) {
+ protocol = &alps_v6_protocol_data;
} else if (ec[0] == 0x88 &&
((ec[1] & 0xf0) == 0xb0 || (ec[1] & 0xf0) == 0xc0)) {
protocol = &alps_v7_protocol_data;
--
1.7.9.5
next prev parent reply other threads:[~2016-06-06 11:24 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 11:23 [PATCH 0/5] Input: alps - cleanup Pali Rohár
2016-06-06 11:23 ` Pali Rohár [this message]
2016-06-06 11:23 ` [PATCH 2/5] Input: alps - move ALPS_PROTO_V4 out of alps_model_data table Pali Rohár
2016-06-06 11:23 ` [PATCH 3/5] Input: alps - move ALPS_PROTO_V1 " Pali Rohár
2016-06-06 11:24 ` [PATCH 4/5] Input: alps - warn about unsupported ALPS V9 touchpad Pali Rohár
2016-06-06 11:24 ` [PATCH 5/5] Input: alps - cleanup ALPS_PROTO_V2 detection Pali Rohár
2016-06-06 11:32 ` [PATCH 0/5] Input: alps - cleanup Hans de Goede
2016-06-20 17:49 ` Pali Rohár
2016-06-16 20:24 ` Pali Rohár
2016-06-21 0:31 ` Dmitry Torokhov
2016-06-21 11:27 ` Pali Rohár
2016-07-07 11:41 ` Pali Rohár
2016-07-08 21:37 ` Dmitry Torokhov
2016-07-09 9:58 ` Pali Rohár
2016-08-09 7:56 ` Pali Rohár
2016-09-14 21:02 ` Pali Rohár
2016-10-21 21:09 ` Pali Rohár
2016-10-24 21:24 ` Dmitry Torokhov
2017-03-04 11:24 ` [PATCH v2 0/3] " Pali Rohár
2017-03-04 11:24 ` [PATCH v2 1/3] Input: alps - move ALPS_PROTO_V4 out of alps_model_data table Pali Rohár
2017-03-04 11:24 ` [PATCH v2 2/3] Input: alps - warn about unsupported ALPS V9 touchpad Pali Rohár
2017-03-04 11:24 ` [PATCH v2 3/3] Input: alps - cleanup alps_model_data Pali Rohár
2017-03-07 17:44 ` [PATCH v2 0/3] Input: alps - cleanup Dmitry Torokhov
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=1465212241-14702-2-git-send-email-pali.rohar@gmail.com \
--to=pali.rohar@gmail.com \
--cc=ben@smart-cactus.org \
--cc=dmitry.torokhov@gmail.com \
--cc=hdegoede@redhat.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).