1 files changed, 27 insertions, 2 deletions

diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index c10235aba7e5..ee01e1902785 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -9,12 +9,33 @@
 #ifndef WACOM_WAC_H
 #define WACOM_WAC_H
 
+/* maximum packet length for USB devices */
+#define WACOM_PKGLEN_MAX        32
+
+/* packet length for individual models */
+#define WACOM_PKGLEN_PENPRTN     7
+#define WACOM_PKGLEN_GRAPHIRE    8
+#define WACOM_PKGLEN_BBFUN       9
+#define WACOM_PKGLEN_INTUOS     10
+#define WACOM_PKGLEN_PENABLED    8
+#define WACOM_PKGLEN_TPC1FG      5
+#define WACOM_PKGLEN_TPC2FG     14
+
+/* device IDs */
 #define STYLUS_DEVICE_ID        0x02
 #define TOUCH_DEVICE_ID         0x03
 #define CURSOR_DEVICE_ID        0x06
 #define ERASER_DEVICE_ID        0x0A
 #define PAD_DEVICE_ID           0x0F
 
+/* wacom data packet report IDs */
+#define WACOM_REPORT_PENABLED           2
+#define WACOM_REPORT_INTUOSREAD         5
+#define WACOM_REPORT_INTUOSWRITE        6
+#define WACOM_REPORT_INTUOSPAD          12
+#define WACOM_REPORT_TPC1FG             6
+#define WACOM_REPORT_TPC2FG             13
+
 enum {
         PENPARTNER = 0,
         GRAPHIRE,
@@ -32,6 +53,7 @@ enum {
         WACOM_BEE,
         WACOM_MO,
         TABLETPC,
+        TABLETPC2FG,
         MAX_TYPE
 };
 
@@ -43,8 +65,11 @@ struct wacom_features {
         int pressure_max;
         int distance_max;
         int type;
-        int touch_x_max;
-        int touch_y_max;
+        int device_type;
+        int x_phy;
+        int y_phy;
+        unsigned char unit;
+        unsigned char unitExpo;
 };
 
 struct wacom_wac {