aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorRene van Paassen <rene.vanpaassen@gmail.com>2007-05-21 00:31:24 -0400
committerDmitry Torokhov <dtor@insightbb.com>2007-07-10 00:35:16 -0400
commitfe981f2340edffcb6aad2203d8f14c9bef0e67e3 (patch)
treebda3360c29a72d0b174697aa540dbbbc9db29f8c /drivers/input
parent2fe574167be6a61d5f37c496da01c4a7daa73f4d (diff)
Input: aiptek - correct the proximity and validity checks
Calculation of proximity bit and of data valid bits were reversed for stylus reports. Signed-off-by: Rene van Paassen <rene.vanpaassen@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/tablet/aiptek.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index 86a750e88fbb..5aa8abf7ec85 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -508,8 +508,8 @@ static void aiptek_irq(struct urb *urb)
508 y = le16_to_cpu(get_unaligned((__le16 *) (data + 3))); 508 y = le16_to_cpu(get_unaligned((__le16 *) (data + 3)));
509 z = le16_to_cpu(get_unaligned((__le16 *) (data + 6))); 509 z = le16_to_cpu(get_unaligned((__le16 *) (data + 6)));
510 510
511 p = (data[5] & 0x01) != 0 ? 1 : 0; 511 dv = (data[5] & 0x01) != 0 ? 1 : 0;
512 dv = (data[5] & 0x02) != 0 ? 1 : 0; 512 p = (data[5] & 0x02) != 0 ? 1 : 0;
513 tip = (data[5] & 0x04) != 0 ? 1 : 0; 513 tip = (data[5] & 0x04) != 0 ? 1 : 0;
514 514
515 /* Use jitterable to re-arrange button masks 515 /* Use jitterable to re-arrange button masks
@@ -587,8 +587,8 @@ static void aiptek_irq(struct urb *urb)
587 587
588 jitterable = data[5] & 0x1c; 588 jitterable = data[5] & 0x1c;
589 589
590 p = (data[5] & 0x01) != 0 ? 1 : 0; 590 dv = (data[5] & 0x01) != 0 ? 1 : 0;
591 dv = (data[5] & 0x02) != 0 ? 1 : 0; 591 p = (data[5] & 0x02) != 0 ? 1 : 0;
592 left = (data[5] & aiptek->curSetting.mouseButtonLeft) != 0 ? 1 : 0; 592 left = (data[5] & aiptek->curSetting.mouseButtonLeft) != 0 ? 1 : 0;
593 right = (data[5] & aiptek->curSetting.mouseButtonRight) != 0 ? 1 : 0; 593 right = (data[5] & aiptek->curSetting.mouseButtonRight) != 0 ? 1 : 0;
594 middle = (data[5] & aiptek->curSetting.mouseButtonMiddle) != 0 ? 1 : 0; 594 middle = (data[5] & aiptek->curSetting.mouseButtonMiddle) != 0 ? 1 : 0;
@@ -634,8 +634,8 @@ static void aiptek_irq(struct urb *urb)
634 else if (data[0] == 4) { 634 else if (data[0] == 4) {
635 jitterable = data[1] & 0x18; 635 jitterable = data[1] & 0x18;
636 636
637 p = (data[1] & 0x01) != 0 ? 1 : 0; 637 dv = (data[1] & 0x01) != 0 ? 1 : 0;
638 dv = (data[1] & 0x02) != 0 ? 1 : 0; 638 p = (data[1] & 0x02) != 0 ? 1 : 0;
639 tip = (data[1] & 0x04) != 0 ? 1 : 0; 639 tip = (data[1] & 0x04) != 0 ? 1 : 0;
640 bs = (data[1] & aiptek->curSetting.stylusButtonLower) != 0 ? 1 : 0; 640 bs = (data[1] & aiptek->curSetting.stylusButtonLower) != 0 ? 1 : 0;
641 pck = (data[1] & aiptek->curSetting.stylusButtonUpper) != 0 ? 1 : 0; 641 pck = (data[1] & aiptek->curSetting.stylusButtonUpper) != 0 ? 1 : 0;
@@ -684,8 +684,8 @@ static void aiptek_irq(struct urb *urb)
684 else if (data[0] == 5) { 684 else if (data[0] == 5) {
685 jitterable = data[1] & 0x1c; 685 jitterable = data[1] & 0x1c;
686 686
687 p = (data[1] & 0x01) != 0 ? 1 : 0; 687 dv = (data[1] & 0x01) != 0 ? 1 : 0;
688 dv = (data[1] & 0x02) != 0 ? 1 : 0; 688 p = (data[1] & 0x02) != 0 ? 1 : 0;
689 left = (data[1]& aiptek->curSetting.mouseButtonLeft) != 0 ? 1 : 0; 689 left = (data[1]& aiptek->curSetting.mouseButtonLeft) != 0 ? 1 : 0;
690 right = (data[1] & aiptek->curSetting.mouseButtonRight) != 0 ? 1 : 0; 690 right = (data[1] & aiptek->curSetting.mouseButtonRight) != 0 ? 1 : 0;
691 middle = (data[1] & aiptek->curSetting.mouseButtonMiddle) != 0 ? 1 : 0; 691 middle = (data[1] & aiptek->curSetting.mouseButtonMiddle) != 0 ? 1 : 0;