drivers/base: use %*pb[l] to print bitmaps including cpumasks and nodemasks

[karo-tx-linux.git] / drivers / hid / wacom_wac.h

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index bfad815cda8a98514904162c74ca29a163e7c9ce..021ee1c1980a832717f575d1fe50aa0df0071236 100644 (file)
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -10,9 +10,10 @@
 #define WACOM_WAC_H
 
 #include <linux/types.h>
+#include <linux/hid.h>
 
 /* maximum packet length for USB devices */
-#define WACOM_PKGLEN_MAX       68
+#define WACOM_PKGLEN_MAX       192
 
 #define WACOM_NAME_MAX         64
 
@@ -36,6 +37,7 @@
 /* wacom data size per MT contact */
 #define WACOM_BYTES_PER_MT_PACKET      11
 #define WACOM_BYTES_PER_24HDT_PACKET   14
+#define WACOM_BYTES_PER_QHDTHID_PACKET  6
 
 /* device IDs */
 #define STYLUS_DEVICE_ID       0x02
@@ -57,6 +59,8 @@
 #define WACOM_REPORT_TPCMT             13
 #define WACOM_REPORT_TPCMT2            3
 #define WACOM_REPORT_TPCHID            15
+#define WACOM_REPORT_CINTIQ            16
+#define WACOM_REPORT_CINTIQPAD         17
 #define WACOM_REPORT_TPCST             16
 #define WACOM_REPORT_DTUS              17
 #define WACOM_REPORT_TPC1FGE           18
@@ -71,6 +75,14 @@
 #define WACOM_QUIRK_MONITOR            0x0008
 #define WACOM_QUIRK_BATTERY            0x0010
 
+#define WACOM_PEN_FIELD(f)     (((f)->logical == HID_DG_STYLUS) || \
+                                ((f)->physical == HID_DG_STYLUS) || \
+                                ((f)->physical == HID_DG_PEN) || \
+                                ((f)->application == HID_DG_PEN))
+#define WACOM_FINGER_FIELD(f)  (((f)->logical == HID_DG_FINGER) || \
+                                ((f)->physical == HID_DG_FINGER) || \
+                                ((f)->application == HID_DG_TOUCHSCREEN))
+
 enum {
        PENPARTNER = 0,
        GRAPHIRE,
@@ -100,6 +112,7 @@ enum {
        WACOM_22HD,
        DTK,
        WACOM_24HD,
+       WACOM_27QHD,
        CINTIQ_HYBRID,
        CINTIQ,
        WACOM_BEE,
@@ -108,6 +121,7 @@ enum {
        WIRELESS,
        BAMBOO_PT,
        WACOM_24HDT,
+       WACOM_27QHDT,
        TABLETPC,   /* add new TPC below */
        TABLETPCE,
        TABLETPC2FG,
@@ -180,6 +194,7 @@ struct wacom_wac {
        int tool[2];
        int id[2];
        __u32 serial[2];
+       bool reporting_data;
        struct wacom_features features;
        struct wacom_shared *shared;
        struct input_dev *input;