hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Input: elantech - use all 3 bytes when checking version 

Apparently all 3 bytes returned by ETP_FW_VERSION_QUERY are significant
and should be taken into account when matching hardware version/features.

Tested-by: Eric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2010-05-13 00:41:15 -07:00
parent 513d8be988
commit 504e8beed1
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/input/mouse/elantech.c
View File

@ -184,7 +184,7 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse)
int fingers; int fingers;
static int old_fingers; static int old_fingers;
if (etd->fw_version_maj == 0x01) { if (etd->fw_version < 0x020000) {
/* /*
* byte 0: D U p1 p2 1 p3 R L * byte 0: D U p1 p2 1 p3 R L
* byte 1: f 0 th tw x9 x8 y9 y8 * byte 1: f 0 th tw x9 x8 y9 y8
@ -226,7 +226,7 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse)
input_report_key(dev, BTN_LEFT, packet[0] & 0x01); input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
input_report_key(dev, BTN_RIGHT, packet[0] & 0x02); input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
if ((etd->fw_version_maj == 0x01) && if (etd->fw_version < 0x020000 &&
(etd->capabilities & ETP_CAP_HAS_ROCKER)) { (etd->capabilities & ETP_CAP_HAS_ROCKER)) {
/* rocker up */ /* rocker up */
input_report_key(dev, BTN_FORWARD, packet[0] & 0x40); input_report_key(dev, BTN_FORWARD, packet[0] & 0x40);
@ -320,7 +320,7 @@ static int elantech_check_parity_v1(struct psmouse *psmouse)
unsigned char p1, p2, p3; unsigned char p1, p2, p3;
/* Parity bits are placed differently */ /* Parity bits are placed differently */
if (etd->fw_version_maj == 0x01) { if (etd->fw_version < 0x020000) {
/* byte 0: D U p1 p2 1 p3 R L */ /* byte 0: D U p1 p2 1 p3 R L */
p1 = (packet[0] & 0x20) >> 5; p1 = (packet[0] & 0x20) >> 5;
p2 = (packet[0] & 0x10) >> 4; p2 = (packet[0] & 0x10) >> 4;
@ -456,7 +456,7 @@ static void elantech_set_input_params(struct psmouse *psmouse)
switch (etd->hw_version) { switch (etd->hw_version) {
case 1: case 1:
/* Rocker button */ /* Rocker button */
if ((etd->fw_version_maj == 0x01) && if (etd->fw_version < 0x020000 &&
(etd->capabilities & ETP_CAP_HAS_ROCKER)) { (etd->capabilities & ETP_CAP_HAS_ROCKER)) {
__set_bit(BTN_FORWARD, dev->keybit); __set_bit(BTN_FORWARD, dev->keybit);
__set_bit(BTN_BACK, dev->keybit); __set_bit(BTN_BACK, dev->keybit);
@ -685,15 +685,14 @@ int elantech_init(struct psmouse *psmouse)
pr_err("elantech.c: failed to query firmware version.\n"); pr_err("elantech.c: failed to query firmware version.\n");
goto init_fail; goto init_fail;
} }
etd->fw_version_maj = param[0];
etd->fw_version_min = param[2]; etd->fw_version = (param[0] << 16) | (param[1] << 8) | param[2];
/* /*
* Assume every version greater than this is new EeePC style * Assume every version greater than this is new EeePC style
* hardware with 6 byte packets * hardware with 6 byte packets
*/ */
if ((etd->fw_version_maj == 0x02 && etd->fw_version_min >= 0x30) || if (etd->fw_version >= 0x020030) {
etd->fw_version_maj > 0x02) {
etd->hw_version = 2; etd->hw_version = 2;
/* For now show extra debug information */ /* For now show extra debug information */
etd->debug = 1; etd->debug = 1;
@ -703,8 +702,9 @@ int elantech_init(struct psmouse *psmouse)
etd->hw_version = 1; etd->hw_version = 1;
etd->paritycheck = 1; etd->paritycheck = 1;
} }
pr_info("elantech.c: assuming hardware version %d, firmware version %d.%d\n",
etd->hw_version, etd->fw_version_maj, etd->fw_version_min); pr_info("elantech.c: assuming hardware version %d, firmware version %d.%d.%d\n",
etd->hw_version, param[0], param[1], param[2]);
if (synaptics_send_cmd(psmouse, ETP_CAPABILITIES_QUERY, param)) { if (synaptics_send_cmd(psmouse, ETP_CAPABILITIES_QUERY, param)) {
pr_err("elantech.c: failed to query capabilities.\n"); pr_err("elantech.c: failed to query capabilities.\n");
@ -719,8 +719,8 @@ int elantech_init(struct psmouse *psmouse)
* a touch action starts causing the mouse cursor or scrolled page * a touch action starts causing the mouse cursor or scrolled page
* to jump. Enable a workaround. * to jump. Enable a workaround.
*/ */
if (etd->fw_version_maj == 0x02 && etd->fw_version_min == 0x22) { if (etd->fw_version == 0x020022) {
pr_info("elantech.c: firmware version 2.34 detected, " pr_info("elantech.c: firmware version 2.0.34 detected, "
"enabling jumpy cursor workaround\n"); "enabling jumpy cursor workaround\n");
etd->jumpy_cursor = 1; etd->jumpy_cursor = 1;
} }

5
drivers/input/mouse/elantech.h
View File

@ -100,11 +100,10 @@ struct elantech_data {
unsigned char reg_26; unsigned char reg_26;
unsigned char debug; unsigned char debug;
unsigned char capabilities; unsigned char capabilities;
unsigned char fw_version_maj;
unsigned char fw_version_min;
unsigned char hw_version;
unsigned char paritycheck; unsigned char paritycheck;
unsigned char jumpy_cursor; unsigned char jumpy_cursor;
unsigned char hw_version;
unsigned int fw_version;
unsigned char parity[256]; unsigned char parity[256];
}; };