Merge branch 'for-4.18/multitouch' into for-linus
[sfrench/cifs-2.6.git] / include / linux / hid.h
index a1be991e1eae40388ce1cab2924ba997a6c77a60..41a3d5775394fed48e7b880317eaf6c1944c2817 100644 (file)
@@ -372,6 +372,7 @@ struct hid_item {
 #define HID_GROUP_RMI                          0x0100
 #define HID_GROUP_WACOM                                0x0101
 #define HID_GROUP_LOGITECH_DJ_DEVICE           0x0102
+#define HID_GROUP_STEAM                                0x0103
 
 /*
  * HID protocol status
@@ -526,6 +527,12 @@ enum hid_type {
        HID_TYPE_USBNONE
 };
 
+enum hid_battery_status {
+       HID_BATTERY_UNKNOWN = 0,
+       HID_BATTERY_QUERIED,            /* Kernel explicitly queried battery strength */
+       HID_BATTERY_REPORTED,           /* Device sent unsolicited battery strength report */
+};
+
 struct hid_driver;
 struct hid_ll_driver;
 
@@ -568,7 +575,8 @@ struct hid_device {                                                 /* device report descriptor */
        __s32 battery_max;
        __s32 battery_report_type;
        __s32 battery_report_id;
-       bool battery_reported;
+       enum hid_battery_status battery_status;
+       bool battery_avoid_query;
 #endif
 
        unsigned int status;                                            /* see STAT flags above */