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>

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index 321269c1ac4c..78fbd3f42009 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -25,6 +25,10 @@
 #define WACOM_PKGLEN_BBTOUCH3   64
 #define WACOM_PKGLEN_BBPEN      10
 #define WACOM_PKGLEN_WIRELESS   32
+#define WACOM_PKGLEN_MTOUCH     62
+
+/* wacom data size per MT contact */
+#define WACOM_BYTES_PER_MT_PACKET       11
 
 /* device IDs */
 #define STYLUS_DEVICE_ID        0x02
@@ -41,6 +45,7 @@
 #define WACOM_REPORT_INTUOS5PAD         3
 #define WACOM_REPORT_TPC1FG             6
 #define WACOM_REPORT_TPC2FG             13
+#define WACOM_REPORT_TPCMT              13
 #define WACOM_REPORT_TPCHID             15
 #define WACOM_REPORT_TPCST              16
 
@@ -76,6 +81,7 @@ enum {
         WACOM_MO,
         TABLETPC,
         TABLETPC2FG,
+        MTSCREEN,
         MAX_TYPE
 };
 
@@ -118,6 +124,8 @@ struct wacom_wac {
         struct input_dev *input;
         int pid;
         int battery_capacity;
+        int num_contacts_left;
+        int *slots;
 };
 
 #endif