diff options
author | Chuck Ebbert <cebbert@redhat.com> | 2010-09-13 15:57:40 -0400 |
---|---|---|
committer | Chuck Ebbert <cebbert@redhat.com> | 2010-09-13 15:57:40 -0400 |
commit | 1d13b01aba24af0a9dffa76d85abaa02e80ba687 (patch) | |
tree | c05557705dd6cd332da843344805e6377fd66c5f /wacom-05-add-a-quirk-for-low-resolution-bamboo-devices.patch | |
parent | db42d7353c3452dc3f7b98d25778e7a7754c9685 (diff) | |
download | kernel-1d13b01aba24af0a9dffa76d85abaa02e80ba687.tar.gz kernel-1d13b01aba24af0a9dffa76d85abaa02e80ba687.tar.xz kernel-1d13b01aba24af0a9dffa76d85abaa02e80ba687.zip |
Add preliminary support for Wacom Bamboo pen and touch devices.
Diffstat (limited to 'wacom-05-add-a-quirk-for-low-resolution-bamboo-devices.patch')
-rw-r--r-- | wacom-05-add-a-quirk-for-low-resolution-bamboo-devices.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/wacom-05-add-a-quirk-for-low-resolution-bamboo-devices.patch b/wacom-05-add-a-quirk-for-low-resolution-bamboo-devices.patch new file mode 100644 index 000000000..1809ec03e --- /dev/null +++ b/wacom-05-add-a-quirk-for-low-resolution-bamboo-devices.patch @@ -0,0 +1,69 @@ +From: Henrik Rydberg <rydberg@euromail.se> +Date: Sun, 5 Sep 2010 19:57:13 +0000 (-0700) +Subject: Input: wacom - add a quirk for low resolution Bamboo devices +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdtor%2Finput.git;a=commitdiff_plain;h=f4ccbef2886968ed409939531f6dd0474d53a12a + +Input: wacom - add a quirk for low resolution Bamboo devices + +The Bamboo Touch reports a sub-screen resolution of 480x320. The +signal-to-noise ratio is only about 100, so filtering is needed in +order to reduce the jitter to a usable level. However, the low +resolution leads to round-off errors in the EWMA filter, resulting in +extremely jerky pointer motion. This patch explicitly sets a higher +resolution for those devices, and tells this to the completion handler +via a low-resolution quirk. + +Signed-off-by: Henrik Rydberg <rydberg@euromail.se> +Acked-by: Ping Cheng <pingc@wacom.com> +Signed-off-by: Dmitry Torokhov <dtor@mail.ru> +--- + +diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c +index 4e9b1dd..2f4411a 100644 +--- a/drivers/input/tablet/wacom_wac.c ++++ b/drivers/input/tablet/wacom_wac.c +@@ -857,6 +857,7 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len) + + static int wacom_bpt_irq(struct wacom_wac *wacom, size_t len) + { ++ struct wacom_features *features = &wacom->features; + struct input_dev *input = wacom->input; + unsigned char *data = wacom->data; + int sp = 0, sx = 0, sy = 0, count = 0; +@@ -871,6 +872,10 @@ static int wacom_bpt_irq(struct wacom_wac *wacom, size_t len) + if (p) { + int x = get_unaligned_be16(&data[9 * i + 3]) & 0x7ff; + int y = get_unaligned_be16(&data[9 * i + 5]) & 0x7ff; ++ if (features->quirks & WACOM_QUIRK_BBTOUCH_LOWRES) { ++ x <<= 5; ++ y <<= 5; ++ } + 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); +@@ -1010,8 +1015,13 @@ void wacom_setup_device_quirks(struct wacom_features *features) + /* quirks for bamboo touch */ + if (features->type == BAMBOO_PT && + features->device_type == BTN_TOOL_TRIPLETAP) { ++ features->x_max <<= 5; ++ features->y_max <<= 5; ++ features->x_fuzz <<= 5; ++ features->y_fuzz <<= 5; + features->pressure_max = 256; + features->pressure_fuzz = 16; ++ features->quirks |= WACOM_QUIRK_BBTOUCH_LOWRES; + } + } + +diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h +index a23d6a5..00ca015 100644 +--- a/drivers/input/tablet/wacom_wac.h ++++ b/drivers/input/tablet/wacom_wac.h +@@ -40,6 +40,7 @@ + + /* device quirks */ + #define WACOM_QUIRK_MULTI_INPUT 0x0001 ++#define WACOM_QUIRK_BBTOUCH_LOWRES 0x0002 + + /* largest reported tracking id */ + #define MAX_TRACKING_ID 0xfff |