Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd...

[sfrench/cifs-2.6.git] / drivers / hid / wacom_wac.h

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 339ab5d81a2da3881f094318bf30bd0088687aa8..0f0b85ec13223a4495bbbf64713b3a4281133ee1 100644 (file)
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -113,6 +113,7 @@ enum {
        MTSCREEN,
        MTTPC,
        MTTPC_B,
+       HID_GENERIC,
        MAX_TYPE
 };
 
@@ -154,6 +155,20 @@ struct wacom_shared {
        struct input_dev *touch_input;
 };
 
+struct hid_data {
+       __s16 inputmode;        /* InputMode HID feature, -1 if non-existent */
+       __s16 inputmode_index;  /* InputMode HID feature index in the report */
+       bool inrange_state;
+       bool invert_state;
+       bool tipswitch;
+       int x;
+       int y;
+       int pressure;
+       int width;
+       int height;
+       int id;
+};
+
 struct wacom_wac {
        char name[WACOM_NAME_MAX];
        char pad_name[WACOM_NAME_MAX];
@@ -167,6 +182,7 @@ struct wacom_wac {
        struct wacom_shared *shared;
        struct input_dev *input;
        struct input_dev *pad_input;
+       bool input_registered;
        int pid;
        int battery_capacity;
        int num_contacts_left;
@@ -174,6 +190,7 @@ struct wacom_wac {
        int ps_connected;
        u8 bt_features;
        u8 bt_high_speed;
+       struct hid_data hid_data;
 };
 
 #endif