From 3efb322fbb7e228b79c40cf1bdd2bb56213876ef Mon Sep 17 00:00:00 2001 From: JJ Ding Date: Fri, 9 Sep 2011 10:27:42 -0700 Subject: [PATCH] --- yaml --- r: 269471 b: refs/heads/master c: 8a360d09b14514139b883d970cd3a1b0b63e6717 h: refs/heads/master i: 269469: 37d57b306d5d9f0f17eeed5f1473c3e0eb4c4ebc 269467: 2f57a19a1dfb3e4a6c7a52357c3f907ff2902f57 269463: b2155eab87e5a34be2d514cb6ded45a0d8200e6f 269455: 8fcfb6fddbe2fa1feb44c24079a6268afec21957 269439: 1ded5f99884a8e5aeae2d9a5e2c43951dabb12c4 v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/elantech.h | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 26d5d3692599..699b7346ea8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 230282a77bcec97f4d0a54e50a44caab5eb39d5c +refs/heads/master: 8a360d09b14514139b883d970cd3a1b0b63e6717 diff --git a/trunk/drivers/input/mouse/elantech.h b/trunk/drivers/input/mouse/elantech.h index b54ea27d10af..d9e614409f92 100644 --- a/trunk/drivers/input/mouse/elantech.h +++ b/trunk/drivers/input/mouse/elantech.h @@ -66,16 +66,13 @@ #define ETP_YMAX_V1 (384 - ETP_EDGE_FUZZ_V1) /* - * It seems the resolution for hardware version 2 doubled. - * Hence the X and Y ranges are doubled too. - * The bezel around the pad also appears to be smaller + * The resolution for older v2 hardware doubled. + * (newer v2's firmware provides command so we can query) */ -#define ETP_EDGE_FUZZ_V2 8 - -#define ETP_XMIN_V2 ( 0 + ETP_EDGE_FUZZ_V2) -#define ETP_XMAX_V2 (1152 - ETP_EDGE_FUZZ_V2) -#define ETP_YMIN_V2 ( 0 + ETP_EDGE_FUZZ_V2) -#define ETP_YMAX_V2 ( 768 - ETP_EDGE_FUZZ_V2) +#define ETP_XMIN_V2 0 +#define ETP_XMAX_V2 1152 +#define ETP_YMIN_V2 0 +#define ETP_YMAX_V2 768 #define ETP_PMIN_V2 0 #define ETP_PMAX_V2 255