1 files changed, 30 insertions, 15 deletions

diff --git a/include/linux/input.h b/include/linux/input.h
index 725dcd0f63a4..15464ba6bf53 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1169,6 +1169,18 @@ struct ff_effect {
 #include <linux/mod_devicetable.h>
 
 /**
+ * struct input_value - input value representation
+ * @type: type of value (EV_KEY, EV_ABS, etc)
+ * @code: the value code
+ * @value: the value
+ */
+struct input_value {
+        __u16 type;
+        __u16 code;
+        __s32 value;
+};
+
+/**
  * struct input_dev - represents an input device
  * @name: name of the device
  * @phys: physical path to the device in the system hierarchy
@@ -1203,11 +1215,7 @@ struct ff_effect {
  *      software autorepeat
  * @timer: timer for software autorepeat
  * @rep: current values for autorepeat parameters (delay, rate)
- * @mt: pointer to array of struct input_mt_slot holding current values
- *      of tracked contacts
- * @mtsize: number of MT slots the device uses
- * @slot: MT slot currently being transmitted
- * @trkid: stores MT tracking ID for the current contact
+ * @mt: pointer to multitouch state
  * @absinfo: array of &struct input_absinfo elements holding information
  *      about absolute axes (current value, min, max, flat, fuzz,
  *      resolution)
@@ -1244,7 +1252,6 @@ struct ff_effect {
  *      last user closes the device
  * @going_away: marks devices that are in a middle of unregistering and
  *      causes input_open_device*() fail with -ENODEV.
- * @sync: set to %true when there were no new events since last EV_SYN
  * @dev: driver model's view of this device
  * @h_list: list of input handles associated with the device. When
  *      accessing the list dev->mutex must be held
@@ -1287,10 +1294,7 @@ struct input_dev {
 
         int rep[REP_CNT];
 
-        struct input_mt_slot *mt;
-        int mtsize;
-        int slot;
-        int trkid;
+        struct input_mt *mt;
 
         struct input_absinfo *absinfo;
 
@@ -1312,12 +1316,14 @@ struct input_dev {
         unsigned int users;
         bool going_away;
 
-        bool sync;
-
         struct device dev;
 
         struct list_head        h_list;
         struct list_head        node;
+
+        unsigned int num_vals;
+        unsigned int max_vals;
+        struct input_value *vals;
 };
 #define to_input_dev(d) container_of(d, struct input_dev, dev)
 
@@ -1378,6 +1384,9 @@ struct input_handle;
  * @event: event handler. This method is being called by input core with
  *      interrupts disabled and dev->event_lock spinlock held and so
  *      it may not sleep
+ * @events: event sequence handler. This method is being called by
+ *      input core with interrupts disabled and dev->event_lock
+ *      spinlock held and so it may not sleep
  * @filter: similar to @event; separates normal event handlers from
  *      "filters".
  * @match: called after comparing device's id with handler's id_table
@@ -1387,8 +1396,8 @@ struct input_handle;
  * @start: starts handler for given handle. This function is called by
  *      input core right after connect() method and also when a process
  *      that "grabbed" a device releases it
- * @fops: file operations this driver implements
- * @minor: beginning of range of 32 minors for devices this driver
+ * @legacy_minors: set to %true by drivers using legacy minor ranges
+ * @minor: beginning of range of 32 legacy minors for devices this driver
  *      can provide
  * @name: name of the handler, to be shown in /proc/bus/input/handlers
  * @id_table: pointer to a table of input_device_ids this driver can
@@ -1414,13 +1423,15 @@ struct input_handler {
         void *private;
 
         void (*event)(struct input_handle *handle, unsigned int type, unsigned int code, int value);
+        void (*events)(struct input_handle *handle,
+                       const struct input_value *vals, unsigned int count);
         bool (*filter)(struct input_handle *handle, unsigned int type, unsigned int code, int value);
         bool (*match)(struct input_handler *handler, struct input_dev *dev);
         int (*connect)(struct input_handler *handler, struct input_dev *dev, const struct input_device_id *id);
         void (*disconnect)(struct input_handle *handle);
         void (*start)(struct input_handle *handle);
 
-        const struct file_operations *fops;
+        bool legacy_minors;
         int minor;
         const char *name;
 
@@ -1488,6 +1499,10 @@ void input_reset_device(struct input_dev *);
 int __must_check input_register_handler(struct input_handler *);
 void input_unregister_handler(struct input_handler *);
 
+int __must_check input_get_new_minor(int legacy_base, unsigned int legacy_num,
+                                     bool allow_dynamic);
+void input_free_minor(unsigned int minor);
+
 int input_handler_for_each_handle(struct input_handler *, void *data,
                                   int (*fn)(struct input_handle *, void *));