Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-bionic-kernel.git] / include / linux / hid.h

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 75b66eccc69278323ce0848e3fcfa46093caf56e..5be325d890d96f9d823753e92296c379e3751076 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -231,7 +231,11 @@ struct hid_item {
 #define HID_DG_TAP             0x000d0035
 #define HID_DG_TABLETFUNCTIONKEY       0x000d0039
 #define HID_DG_PROGRAMCHANGEKEY        0x000d003a
+#define HID_DG_BATTERYSTRENGTH 0x000d003b
 #define HID_DG_INVERT          0x000d003c
+#define HID_DG_TILT_X          0x000d003d
+#define HID_DG_TILT_Y          0x000d003e
+#define HID_DG_TWIST           0x000d0041
 #define HID_DG_TIPSWITCH       0x000d0042
 #define HID_DG_TIPSWITCH2      0x000d0043
 #define HID_DG_BARRELSWITCH    0x000d0044
@@ -264,6 +268,8 @@ struct hid_item {
 #define HID_CP_APPLICATIONLAUNCHBUTTONS        0x000c0180
 #define HID_CP_GENERICGUIAPPLICATIONCONTROLS   0x000c0200
 
+#define HID_DG_DEVICECONFIG    0x000d000e
+#define HID_DG_DEVICESETTINGS  0x000d0023
 #define HID_DG_CONFIDENCE      0x000d0047
 #define HID_DG_WIDTH           0x000d0048
 #define HID_DG_HEIGHT          0x000d0049
@@ -318,7 +324,7 @@ struct hid_item {
 #define HID_QUIRK_MULTI_INPUT                  0x00000040
 #define HID_QUIRK_HIDINPUT_FORCE               0x00000080
 #define HID_QUIRK_NO_EMPTY_INPUT               0x00000100
-#define HID_QUIRK_NO_INIT_INPUT_REPORTS                0x00000200
+/* 0x00000200 reserved for backward compatibility, was NO_INIT_INPUT_REPORTS */
 #define HID_QUIRK_ALWAYS_POLL                  0x00000400
 #define HID_QUIRK_SKIP_OUTPUT_REPORTS          0x00010000
 #define HID_QUIRK_SKIP_OUTPUT_REPORT_ID                0x00020000
@@ -479,6 +485,7 @@ struct hid_input {
        struct list_head list;
        struct hid_report *report;
        struct input_dev *input;
+       bool registered;
 };
 
 enum hid_type {
@@ -536,7 +543,6 @@ struct hid_device {                                                 /* device report descriptor */
        struct list_head inputs;                                        /* The list of inputs */
        void *hiddev;                                                   /* The hiddev structure */
        void *hidraw;
-       int minor;                                                      /* Hiddev minor number */
 
        int open;                                                       /* is the device open by anyone? */
        char name[128];                                                 /* Device name */
@@ -837,7 +843,7 @@ __u32 hid_field_extract(const struct hid_device *hid, __u8 *report,
  */
 static inline void hid_device_io_start(struct hid_device *hid) {
        if (hid->io_started) {
-               dev_warn(&hid->dev, "io already started");
+               dev_warn(&hid->dev, "io already started\n");
                return;
        }
        hid->io_started = true;
@@ -857,7 +863,7 @@ static inline void hid_device_io_start(struct hid_device *hid) {
  */
 static inline void hid_device_io_stop(struct hid_device *hid) {
        if (!hid->io_started) {
-               dev_warn(&hid->dev, "io already stopped");
+               dev_warn(&hid->dev, "io already stopped\n");
                return;
        }
        hid->io_started = false;