All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Pali Rohár" <pali.rohar@gmail.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Pali Rohár" <pali.rohar@gmail.com>
Subject: [PATCH v2 1/3] Input: alps - move ALPS_PROTO_V4 out of alps_model_data table
Date: Sat,  4 Mar 2017 12:24:24 +0100	[thread overview]
Message-ID: <1488626666-16577-2-git-send-email-pali.rohar@gmail.com> (raw)
In-Reply-To: <1488626666-16577-1-git-send-email-pali.rohar@gmail.com>

Like for other protocols create alps_v4_protocol_data and use it in
alps_identify() function.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
 drivers/input/mouse/alps.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 72b28eb..f36de82 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -138,7 +138,6 @@
 	{ { 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 */
-	{ { 0x73, 0x02, 0x64 }, 0x8a, { ALPS_PROTO_V4, 0x8f, 0x8f, 0 } },
 };
 
 static const struct alps_protocol_info alps_v3_protocol_data = {
@@ -149,6 +148,10 @@
 	ALPS_PROTO_V3_RUSHMORE, 0x8f, 0x8f, ALPS_DUALPOINT
 };
 
+static const struct alps_protocol_info alps_v4_protocol_data = {
+	ALPS_PROTO_V4, 0x8f, 0x8f, 0
+};
+
 static const struct alps_protocol_info alps_v5_protocol_data = {
 	ALPS_PROTO_V5, 0xc8, 0xd8, 0
 };
@@ -2815,7 +2818,10 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv)
 
 	protocol = alps_match_table(e7, ec);
 	if (!protocol) {
-		if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0x50 &&
+		if (e7[0] == 0x73 && e7[1] == 0x02 && e7[2] == 0x64 &&
+			   ec[2] == 0x8a) {
+			protocol = &alps_v4_protocol_data;
+		} else 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 (ec[0] == 0x88 &&
-- 
1.7.9.5

  reply	other threads:[~2017-03-04 11:32 UTC|newest]

Thread overview: 28+ 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
2016-06-06 11:23 ` [PATCH 1/5] Input: alps - move ALPS_PROTO_V6 out of alps_model_data table Pali Rohár
2016-06-06 11:23 ` [PATCH 2/5] Input: alps - move ALPS_PROTO_V4 " 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  0:31   ` Dmitry Torokhov
2016-06-21 11:27   ` Pali Rohár
2016-06-21 11:27     ` Pali Rohár
2016-07-07 11:41     ` Pali Rohár
2016-07-07 11:41       ` Pali Rohár
2016-07-08 21:37       ` Dmitry Torokhov
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   ` Pali Rohár [this message]
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=1488626666-16577-2-git-send-email-pali.rohar@gmail.com \
    --to=pali.rohar@gmail.com \
    --cc=dmitry.torokhov@gmail.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 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.