aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet/wacom.h
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2012-04-29 21:09:18 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-04-29 21:13:53 -0700
commit1963518b9b1b8019d33b4b08deee6f873ffa2730 (patch)
tree5bcdd926950a9b75799232f7f5b6dd3d95905a7f /drivers/input/tablet/wacom.h
parentInput: wacom - retrieve maximum number of touch points (diff)
downloadlinux-dev-1963518b9b1b8019d33b4b08deee6f873ffa2730.tar.xz
linux-dev-1963518b9b1b8019d33b4b08deee6f873ffa2730.zip
Input: wacom - add 0xE5 (MT device) support
Main part of patch is adding support for a new Wacom MT touch packet and labels these devices using MTSCREEN type. Other items of interest: Delete some duplicate code in HID parsing for Y info since its already done in X path. In wacom_query_tablet_data(), only invoke the set report that requests tablets to send Wacom Touch packets for Finger interfaces. Mostly, this is to make code intent clear. Tested-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Chris Bagwell <chris@cnpbagwell.com> Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/tablet/wacom.h')
-rw-r--r--drivers/input/tablet/wacom.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h
index b4842d0e61dd..b79d45198d82 100644
--- a/drivers/input/tablet/wacom.h
+++ b/drivers/input/tablet/wacom.h
@@ -135,6 +135,6 @@ extern const struct usb_device_id wacom_ids[];
void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len);
void wacom_setup_device_quirks(struct wacom_features *features);
-void wacom_setup_input_capabilities(struct input_dev *input_dev,
- struct wacom_wac *wacom_wac);
+int wacom_setup_input_capabilities(struct input_dev *input_dev,
+ struct wacom_wac *wacom_wac);
#endif