Merge branch 'for-4.14/wacom' into for-linus

[people/arne_f/kernel.git] / include / linux / hid.h

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 3853408daf7f4f6d135e7f1d4a77a0770762e22b..08ab9864d81e1c2e8bb252eeeae6d19493b62ae5 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -173,6 +173,7 @@ struct hid_item {
 #define HID_UP_LOGIVENDOR3   0xff430000
 #define HID_UP_LNVENDOR                0xffa00000
 #define HID_UP_SENSOR          0x00200000
+#define HID_UP_ASUSVENDOR      0xff310000
 
 #define HID_USAGE              0x0000ffff
 
@@ -292,6 +293,7 @@ struct hid_item {
 #define HID_DG_BARRELSWITCH2   0x000d005a
 #define HID_DG_TOOLSERIALNUMBER        0x000d005b
 
+#define HID_VD_ASUS_CUSTOM_MEDIA_KEYS  0xff310076
 /*
  * HID report types --- Ouch! HID spec says 1 2 3!
  */
@@ -526,7 +528,6 @@ struct hid_device {                                                 /* device report descriptor */
        struct hid_report_enum report_enum[HID_REPORT_TYPES];
        struct work_struct led_work;                                    /* delayed LED worker */
 
-       struct semaphore driver_lock;                                   /* protects the current driver, except during input */
        struct semaphore driver_input_lock;                             /* protects the current driver */
        struct device dev;                                              /* device */
        struct hid_driver *driver;
@@ -542,16 +543,18 @@ struct hid_device {                                                       /* device report descriptor */
         * battery is non-NULL.
         */
        struct power_supply *battery;
+       __s32 battery_capacity;
        __s32 battery_min;
        __s32 battery_max;
        __s32 battery_report_type;
        __s32 battery_report_id;
+       bool battery_reported;
 #endif
 
        unsigned int status;                                            /* see STAT flags above */
        unsigned claimed;                                               /* Claimed by hidinput, hiddev? */
        unsigned quirks;                                                /* Various quirks the device can pull on us */
-       bool io_started;                                                /* Protected by driver_lock. If IO has started */
+       bool io_started;                                                /* If IO has started */
 
        struct list_head inputs;                                        /* The list of inputs */
        void *hiddev;                                                   /* The hiddev structure */