According to the protocol document, there are a couple of different
versions of the hardware and firmware. Using the version number, it
should be possible to distinguish between them, at least for the
properties we care about.
Signed-off-by: Éric Piel <eric.piel@xxxxxxxxxxxxxxxx>
---
drivers/input/mouse/elantech.c | 34 +++++++++++++++++++++-------------
drivers/input/mouse/elantech.h | 10 +++++++++-
2 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 1c1d065..f32ffda 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -709,15 +709,32 @@ int elantech_init(struct psmouse *psmouse)
* Assume every version greater than this is new EeePC style
* hardware with 6 byte packets
*/
- if (etd->fw_version >= 0x020030) {
+ if (etd->fw_version >= 0x020800) {
etd->hw_version = 2;
/* For now show extra debug information */
etd->debug = 1;
- /* Parity check is only for 4 byte protocol */
- etd->paritycheck = 0;
+ etd->paritycheck = ETP_CONST_CHECK;
+ etd->reports_pres = 1;
+ } else if (etd->fw_version == 0x020030) {
+ etd->hw_version = 2;
+ /* For now show extra debug information */
+ etd->debug = 1;
+ etd->paritycheck = ETP_EF113_CHECK;
+ etd->reports_pres = 0;
+ } else if ((etd->fw_version == 0x020022) || (etd->fw_version == 0x020600)) {
+ /*
+ * This firmware suffers from misreporting coordinates when
+ * a touch action starts causing the mouse cursor or scrolled page
+ * to jump. Enable a workaround.
+ */
+ pr_info("firmware version 2.0.34/2.6.0 detected, enabling jumpy cursor workaround\n");
+ etd->jumpy_cursor = 1;
+ etd->debug = 1;
+ etd->hw_version = 1;
+ etd->paritycheck = ETP_FULL_PC;
} else {
etd->hw_version = 1;
- etd->paritycheck = 1;
+ etd->paritycheck = ETP_FULL_PC;
}
pr_info("assuming hardware version %d, firmware version %d.%d.%d\n",
@@ -731,15 +748,6 @@ int elantech_init(struct psmouse *psmouse)
param[0], param[1], param[2]);
etd->capabilities = param[0];
- /*
- * 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 = 1;
- }
if (elantech_set_absolute_mode(psmouse)) {
pr_err("failed to put touchpad into absolute mode.\n");
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
index ac57bde..b98c3c2 100644
--- a/drivers/input/mouse/elantech.h
+++ b/drivers/input/mouse/elantech.h
@@ -101,12 +101,20 @@ struct elantech_data {
unsigned char debug;
unsigned char capabilities;
unsigned char paritycheck;
- unsigned char jumpy_cursor;
+ unsigned char jumpy_cursor :1;
+ unsigned char reports_pres :1;
unsigned char hw_version;
unsigned int fw_version;
unsigned char parity[256];
};
+enum paritycheck_types {
+ ETP_NOT_CHECK = 0,
+ ETP_FULL_PC, /* used in 4-byte protocol */
+ ETP_EF113_CHECK, /* check used only on the EF113 */
+ ETP_CONST_CHECK, /* used in 6-byte protocol, only checking constant bits */
+};
+
#ifdef CONFIG_MOUSE_PS2_ELANTECH
int elantech_detect(struct psmouse *psmouse, bool set_properties);
int elantech_init(struct psmouse *psmouse);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
