summaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet/wacom_wac.h
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2012-10-21 00:38:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-25 16:02:36 -0700
commitaea2bf6a57a9e4596bfad164f986ba10ddc6adf3 (patch)
tree00429471214d5c987b1e40fcd5018599454588d0 /drivers/input/tablet/wacom_wac.h
parent2008713c7174e5c0f207bac684c6df0939047009 (diff)
downloadblackbird-op-linux-aea2bf6a57a9e4596bfad164f986ba10ddc6adf3.tar.gz
blackbird-op-linux-aea2bf6a57a9e4596bfad164f986ba10ddc6adf3.zip
Input: wacom - handle split-sensor devices with internal hubs
Like our other pen-and-touch products, the Cintiq 24HD touch needs data to be shared between its two sensors to facilitate proximity-based palm rejection. Unlike other tablets that report sensor data through separate interfaces of the same USB device, the Cintiq 24HD touch has separate USB devices that are connected to an internal USB hub. This patch makes it possible to designate the USB VID/PID of the other device so that the two may share data. To ensure we don't accidentally link to a sensor from a physically separate device (if several have been plugged in), we limit the search to siblings (i.e., devices directly connected to the same hub). Signed-off-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/input/tablet/wacom_wac.h')
-rw-r--r--drivers/input/tablet/wacom_wac.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index 96c185cc301e..3f926ec19ef9 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -109,6 +109,8 @@ struct wacom_features {
int distance_fuzz;
unsigned quirks;
unsigned touch_max;
+ int oVid;
+ int oPid;
};
struct wacom_shared {
OpenPOWER on IntegriCloud