Fix bitmask bug in position reporting

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

8 files changed, 17 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index b8bf517..90081cd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME    = wacom
-VERSION = 1.0.1
+VERSION = 1.0.2
 SRC     = usr/src
 
 TARBALL = $(NAME)-$(VERSION).dkms.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 7815159..257fe9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wacom-dkms (1.0.2) maverick; urgency=low
+
+  * Fix bitmask bug in position
+
+ -- Henrik Rydberg <rydberg@bitmath.org>  Mon, 30 Aug 2010 00:45:15 +0200
+
 wacom-dkms (1.0.1) maverick; urgency=low
 
   * Improve bamboo touch resolution
diff --git a/debian/postinst b/debian/postinst
index 1812293..0e67711 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,7 +3,7 @@
 set -e
 
 NAME=wacom
-VERSION=1.0.1
+VERSION=1.0.2
 
 case "$1" in
     configure)
diff --git a/debian/postrm b/debian/postrm
index e809ff1..7a29a1e 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=wacom
-VERSION=1.0.1
+VERSION=1.0.2
 
 set -e
 
diff --git a/debian/prerm b/debian/prerm
index bc3e47d..183216e 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=wacom
-VERSION=1.0.1
+VERSION=1.0.2
 
 set -e
 
diff --git a/debian/rules b/debian/rules
index 6ee0e64..bc35587 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 NAME=wacom
-VERSION=1.0.1
+VERSION=1.0.2
 
 configure: configure-stamp
 configure-stamp:
diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf
index 9d2da13..fc054d5 100644
--- a/usr/src/dkms_source_tree/dkms.conf
+++ b/usr/src/dkms_source_tree/dkms.conf
@@ -1,5 +1,5 @@
 NAME=wacom
-VERSION=1.0.1
+VERSION=1.0.2
 PACKAGE_NAME="$NAME"
 PACKAGE_VERSION="$VERSION"
 MAKE[0]="make -C ${kernel_source_dir}
diff --git a/usr/src/dkms_source_tree/wacom_wac.c b/usr/src/dkms_source_tree/wacom_wac.c
index 03a3fdc..d1c388e 100644
--- a/usr/src/dkms_source_tree/wacom_wac.c
+++ b/usr/src/dkms_source_tree/wacom_wac.c
@@ -869,8 +869,11 @@ static int wacom_bbt_irq(struct wacom_wac *wacom, size_t len)
                 int p = data[9 * i + 2];
                 input_mt_slot(input, i);
                 if (p) {
-                        int x = get_unaligned_be16(&data[9 * i + 3]) << 4;
-                        int y = get_unaligned_be16(&data[9 * i + 5]) << 4;
+                        int x = get_unaligned_be16(&data[9 * i + 3]) & 0x7ff;
+                        int y = get_unaligned_be16(&data[9 * i + 5]) & 0x7ff;
+                        /* artificial scaling */
+                        x <<= 4;
+                        y <<= 4;
                         input_report_abs(input, ABS_MT_PRESSURE, p);
                         input_report_abs(input, ABS_MT_POSITION_X, x);
                         input_report_abs(input, ABS_MT_POSITION_Y, y);