Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1189964

[PATCH] Input - elantech: Add special check for fw_version 0x470f01 touchpad

Show all headers | View raw

t is no need to check the packet[0] for sanity check when doing
elantech_packet_check_v4() function for fw_version = 0x470f01 touchpad.

Signed-off by: Duson Lin <dusonlin@emc.com.tw>
---
 drivers/input/mouse/elantech.c |   25 ++++++++++++++++++++++---
 drivers/input/mouse/elantech.h |    1 +
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index ce3d400..d969153 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -784,6 +784,8 @@ static int elantech_packet_check_v4(struct psmouse *psmouse)
 	unsigned char *packet = psmouse->packet;
 	unsigned char packet_type = packet[3] & 0x03;
 	bool sanity_check;
+	/* This represents the version of IC body. */
+	int ver = (etd->fw_version & 0x0f0000) >> 16;
 
 	if (etd->tp_dev && (packet[3] & 0x0f) == 0x06)
 		return PACKET_TRACKPOINT;
@@ -796,9 +798,17 @@ static int elantech_packet_check_v4(struct psmouse *psmouse)
 	 */
 	if (etd->crc_enabled)
 		sanity_check = ((packet[3] & 0x08) == 0x00);
-	else
-		sanity_check = ((packet[0] & 0x0c) == 0x04 &&
-				(packet[3] & 0x1c) == 0x10);
+	else {
+		/* 
+		 * The sanity check only need to check packet[3]
+		 * when IC_body = 7 and PID = 0x2A  
+		 */
+		if (ver == 7 && etd->samples[1] == 0x2A)
+			sanity_check = ((packet[3] & 0x1c) == 0x10);
+		else
+			sanity_check = ((packet[0] & 0x0c) == 0x04 &&
+					(packet[3] & 0x1c) == 0x10);
+	}
 
 	if (!sanity_check)
 		return PACKET_UNKNOWN;
@@ -1648,6 +1658,15 @@ int elantech_init(struct psmouse *psmouse)
 		     etd->capabilities[0], etd->capabilities[1],
 		     etd->capabilities[2]);
 
+	if (etd->send_cmd(psmouse, ETP_SAMPLE_QUERY,
+	    etd->samples)) {
+		psmouse_err(psmouse, "failed to query sample data.\n");
+		goto init_fail;
+	}
+	psmouse_info(psmouse,
+		     "Elan sample query result 0x%02x, 0x%02x, 0x%02x.\n",
+		     etd->samples[0], etd->samples[1], etd->samples[2]);
+
 	if (elantech_set_absolute_mode(psmouse)) {
 		psmouse_err(psmouse,
 			    "failed to put touchpad into absolute mode.\n");
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
index f965d15..e1cbf40 100644
--- a/drivers/input/mouse/elantech.h
+++ b/drivers/input/mouse/elantech.h
@@ -129,6 +129,7 @@ struct elantech_data {
 	unsigned char reg_26;
 	unsigned char debug;
 	unsigned char capabilities[3];
+	unsigned char samples[3];
 	bool paritycheck;
 	bool jumpy_cursor;
 	bool reports_pressure;






--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] Input - elantech: Add special check for fw_version 0x470f01  touchpad duson <dusonlin@emc.com.tw> - 2015-07-22 16:00 +0200
  RE: [PATCH] Input - elantech: Add special check for fw_version 0x470f01  touchpad "DusonLin" <dusonlin@emc.com.tw> - 2015-07-23 02:00 +0200

csiph-web