Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 2978c303909d396acfe9f8e0cbe96307cf8aefa4..1e270d401e181e45802cb869d30998d1017ff735 100644 (file)
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -16,6 +16,8 @@
 #define WACOM_PKGLEN_MAX       192
 
 #define WACOM_NAME_MAX         64
+#define WACOM_MAX_REMOTES      5
+#define WACOM_STATUS_UNKNOWN   255
 
 /* packet length for individual models */
 #define WACOM_PKGLEN_BBFUN      9
@@ -65,11 +67,11 @@
 #define WACOM_REPORT_USB               192
 #define WACOM_REPORT_BPAD_PEN          3
 #define WACOM_REPORT_BPAD_TOUCH                16
+#define WACOM_REPORT_DEVICE_LIST       16
+#define WACOM_REPORT_REMOTE            17
 
 /* device quirks */
 #define WACOM_QUIRK_BBTOUCH_LOWRES     0x0001
-#define WACOM_QUIRK_NO_INPUT           0x0002
-#define WACOM_QUIRK_MONITOR            0x0004
 #define WACOM_QUIRK_BATTERY            0x0008
 
 /* device types */
@@ -77,6 +79,7 @@
 #define WACOM_DEVICETYPE_PEN            0x0001
 #define WACOM_DEVICETYPE_TOUCH          0x0002
 #define WACOM_DEVICETYPE_PAD            0x0004
+#define WACOM_DEVICETYPE_WL_MONITOR     0x0008
 
 #define WACOM_VENDORDEFINED_PEN                0xff0d0001
 
@@ -130,6 +133,7 @@ enum {
        WACOM_24HDT,
        WACOM_27QHDT,
        BAMBOO_PAD,
+       REMOTE,
        TABLETPC,   /* add new TPC below */
        TABLETPCE,
        TABLETPC2FG,
@@ -149,6 +153,7 @@ struct wacom_features {
        int type;
        int x_resolution;
        int y_resolution;
+       int numbered_buttons;
        int x_min;
        int y_min;
        int device_type;
@@ -193,6 +198,10 @@ struct hid_data {
        int width;
        int height;
        int id;
+       int cc_index;
+       int cc_value_index;
+       int num_expected;
+       int num_received;
 };
 
 struct wacom_wac {
@@ -204,7 +213,7 @@ struct wacom_wac {
        unsigned char data[WACOM_PKGLEN_MAX];
        int tool[2];
        int id[2];
-       __u32 serial[2];
+       __u32 serial[5];
        bool reporting_data;
        struct wacom_features features;
        struct wacom_shared *shared;