Merge branches 'for-4.8/upstream-fixes', 'for-4.9/alps', 'for-4.9/hid-input', 'for...

[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 53d16537fd2a101feebf1392a0f51b6abd75a741..324c40b0c1194acd58310df39679a176d9011bb3 100644 (file)
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -82,6 +82,7 @@
 #define WACOM_DEVICETYPE_TOUCH          0x0002
 #define WACOM_DEVICETYPE_PAD            0x0004
 #define WACOM_DEVICETYPE_WL_MONITOR     0x0008
+#define WACOM_DEVICETYPE_DIRECT         0x0010
 
 #define WACOM_VENDORDEFINED_PEN                0xff0d0001
 #define WACOM_G9_PAGE                  0xff090000
@@ -185,7 +186,6 @@ struct wacom_features {
        int pktlen;
        bool check_for_hid_type;
        int hid_type;
-       int last_slot_field;
 };
 
 struct wacom_shared {
@@ -214,35 +214,35 @@ struct hid_data {
        int cc_report;
        int cc_index;
        int cc_value_index;
+       int last_slot_field;
        int num_expected;
        int num_received;
 };
 
+struct wacom_remote_data {
+       struct {
+               u32 serial;
+               bool connected;
+       } remote[WACOM_MAX_REMOTES];
+};
+
 struct wacom_wac {
+       char name[WACOM_NAME_MAX];
        char pen_name[WACOM_NAME_MAX];
        char touch_name[WACOM_NAME_MAX];
        char pad_name[WACOM_NAME_MAX];
-       char bat_name[WACOM_NAME_MAX];
-       char ac_name[WACOM_NAME_MAX];
        unsigned char data[WACOM_PKGLEN_MAX];
        int tool[2];
        int id[2];
-       __u32 serial[5];
+       __u32 serial[2];
        bool reporting_data;
        struct wacom_features features;
        struct wacom_shared *shared;
        struct input_dev *pen_input;
        struct input_dev *touch_input;
        struct input_dev *pad_input;
-       bool pen_registered;
-       bool touch_registered;
-       bool pad_registered;
        int pid;
-       int battery_capacity;
        int num_contacts_left;
-       int bat_charging;
-       int bat_connected;
-       int ps_connected;
        u8 bt_features;
        u8 bt_high_speed;
        int mode_report;