HID: uhid: Add UHID_CREATE2 + UHID_INPUT2

UHID_CREATE2:
HID report descriptor data (rd_data) is an array in struct uhid_create2_req,
instead of a pointer. Enables use from languages that don't support pointers,
e.g. Python.

UHID_INPUT2:
Data array is the last field of struct uhid_input2_req. Enables userspace to
write only the required bytes to kernel (ev.type + ev.u.input2.size + the part
of the data array that matters), instead of the entire struct uhid_input2_req.

Note:
UHID_CREATE2 increases the total size of struct uhid_event slightly, thus
increasing the size of messages that are queued for userspace. However, this
won't affect the userspace processing of these events.

[Jiri Kosina <jkosina@suse.cz>: adjust to hid_get_raw_report() and
				hid_output_raw_report() API changes]

Signed-off-by: Petri Gynther <pgynther@google.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 23 insertions, 0 deletions

diff --git a/include/uapi/linux/uhid.h b/include/uapi/linux/uhid.h
index 414b74be4da1..1e3b09c191cd 100644
--- a/include/uapi/linux/uhid.h
+++ b/include/uapi/linux/uhid.h
@@ -21,6 +21,7 @@
 
 #include <linux/input.h>
 #include <linux/types.h>
+#include <linux/hid.h>
 
 enum uhid_event_type {
         UHID_CREATE,
@@ -34,6 +35,8 @@ enum uhid_event_type {
         UHID_INPUT,
         UHID_FEATURE,
         UHID_FEATURE_ANSWER,
+        UHID_CREATE2,
+        UHID_INPUT2,
 };
 
 struct uhid_create_req {
@@ -50,6 +53,19 @@ struct uhid_create_req {
         __u32 country;
 } __attribute__((__packed__));
 
+struct uhid_create2_req {
+        __u8 name[128];
+        __u8 phys[64];
+        __u8 uniq[64];
+        __u16 rd_size;
+        __u16 bus;
+        __u32 vendor;
+        __u32 product;
+        __u32 version;
+        __u32 country;
+        __u8 rd_data[HID_MAX_DESCRIPTOR_SIZE];
+} __attribute__((__packed__));
+
 #define UHID_DATA_MAX 4096
 
 enum uhid_report_type {
@@ -63,6 +79,11 @@ struct uhid_input_req {
         __u16 size;
 } __attribute__((__packed__));
 
+struct uhid_input2_req {
+        __u16 size;
+        __u8 data[UHID_DATA_MAX];
+} __attribute__((__packed__));
+
 struct uhid_output_req {
         __u8 data[UHID_DATA_MAX];
         __u16 size;
@@ -100,6 +121,8 @@ struct uhid_event {
                 struct uhid_output_ev_req output_ev;
                 struct uhid_feature_req feature;
                 struct uhid_feature_answer_req feature_answer;
+                struct uhid_create2_req create2;
+                struct uhid_input2_req input2;
         } u;
 } __attribute__((__packed__));