UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Input: elantech - clean up elantech_init 

Group property setting code into elantech_set_properties.

Signed-off-by: JJ Ding <jj_ding@emc.com.tw>
Acked-by: Daniel Kurtz <djkurtz@chromium.org>
Acked-by: Éric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
JJ Ding 2011-09-09 10:28:19 -07:00 committed by Dmitry Torokhov
parent 7894f21b10
commit 3c8bbb951a
1 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -790,6 +790,42 @@ static int elantech_reconnect(struct psmouse *psmouse)
return 0;
}
/*
* determine hardware version and set some properties according to it.
*/
static void elantech_set_properties(struct elantech_data *etd)
{
/*
* Assume every version greater than 0x020030 is new EeePC style
* hardware with 6 byte packets, except 0x020600
*/
if (etd->fw_version < 0x020030 || etd->fw_version == 0x020600)
etd->hw_version = 1;
else
etd->hw_version = 2;
/*
* Turn on packet checking by default.
*/
etd->paritycheck = 1;
/*
* This firmware suffers from misreporting coordinates when
* a touch action starts causing the mouse cursor or scrolled page
* to jump. Enable a workaround.
*/
etd->jumpy_cursor =
(etd->fw_version == 0x020022 || etd->fw_version == 0x020600);
if (etd->hw_version == 2) {
/* For now show extra debug information */
etd->debug = 1;
if (etd->fw_version >= 0x020800)
etd->reports_pressure = true;
}
}
/*
* Initialize the touchpad and create sysfs entries
*/
@ -816,26 +852,9 @@ int elantech_init(struct psmouse *psmouse)
}
etd->fw_version = (param[0] << 16) | (param[1] << 8) | param[2];
/*
* Assume every version greater than this is new EeePC style
* hardware with 6 byte packets
*/
if (etd->fw_version >= 0x020030) {
etd->hw_version = 2;
/* For now show extra debug information */
etd->debug = 1;
etd->paritycheck = 1;
if (etd->fw_version >= 0x020800)
etd->reports_pressure = true;
} else {
etd->hw_version = 1;
etd->paritycheck = 1;
}
pr_info("assuming hardware version %d, firmware version %d.%d.%d\n",
elantech_set_properties(etd);
pr_info("assuming hardware version %d "
"(with firmware version 0x%02x%02x%02x)\n",
etd->hw_version, param[0], param[1], param[2]);
if (synaptics_send_cmd(psmouse, ETP_CAPABILITIES_QUERY,
@ -847,16 +866,6 @@ int elantech_init(struct psmouse *psmouse)
etd->capabilities[0], etd->capabilities[1],
etd->capabilities[2]);
/*
* This firmware suffers from misreporting coordinates when
* a touch action starts causing the mouse cursor or scrolled page
* to jump. Enable a workaround.
*/
if (etd->fw_version == 0x020022 || etd->fw_version == 0x020600) {
pr_info("firmware version 2.0.34/2.6.0 detected, enabling jumpy cursor workaround\n");
etd->jumpy_cursor = true;
}
if (elantech_set_absolute_mode(psmouse)) {
pr_err("failed to put touchpad into absolute mode.\n");
goto init_fail;