commit 9d8ae4f1b6ed2dfed2e25d153ec48ff1078bcfc3
author Scott Anderson <saa@google.com> Fri Oct 25 15:02:44 2013 -0700
committer Scott Anderson <saa@google.com> Thu Oct 31 15:45:57 2013 -0700
tree 7e3f5d37b4908f9bad6ea769ca4f80e2c7c10abd
parent 00da6514fb95ac48b462b5d0485559fe282610cf

Update linux/uinput.h

from Linux kernel v3.6 (05be8b81aafd4f95106a91ff3fd8581fa984fad9)

The main goal is to get the UI_SET_PROPBIT ioctl defined.

Change-Id: Ic265ca010a9826864bfb1848300a94e8a462b09c
Signed-off-by: Scott Anderson <saa@google.com>

original/linux/uinput.h

diff --git a/original/linux/uinput.h b/original/linux/uinput.h
index 15ddd44..2aa2881 100644
--- a/original/linux/uinput.h
+++ b/original/linux/uinput.h
@@ -37,7 +37,6 @@
 #define UINPUT_VERSION		3
 
 #ifdef __KERNEL__
-#define UINPUT_MINOR		223
 #define UINPUT_NAME		"uinput"
 #define UINPUT_BUFFER_SIZE	16
 #define UINPUT_NUM_REQUESTS	16
@@ -69,7 +68,7 @@
 	unsigned char		head;
 	unsigned char		tail;
 	struct input_event	buff[UINPUT_BUFFER_SIZE];
-	int			ff_effects_max;
+	unsigned int		ff_effects_max;
 
 	struct uinput_request	*requests[UINPUT_NUM_REQUESTS];
 	wait_queue_head_t	requests_waitq;
@@ -105,6 +104,7 @@
 #define UI_SET_FFBIT		_IOW(UINPUT_IOCTL_BASE, 107, int)
 #define UI_SET_PHYS		_IOW(UINPUT_IOCTL_BASE, 108, char*)
 #define UI_SET_SWBIT		_IOW(UINPUT_IOCTL_BASE, 109, int)
+#define UI_SET_PROPBIT		_IOW(UINPUT_IOCTL_BASE, 110, int)
 
 #define UI_BEGIN_FF_UPLOAD	_IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload)
 #define UI_END_FF_UPLOAD	_IOW(UINPUT_IOCTL_BASE, 201, struct uinput_ff_upload)
@@ -166,11 +166,11 @@
 struct uinput_user_dev {
 	char name[UINPUT_MAX_NAME_SIZE];
 	struct input_id id;
-        int ff_effects_max;
-        int absmax[ABS_MAX + 1];
-        int absmin[ABS_MAX + 1];
-        int absfuzz[ABS_MAX + 1];
-        int absflat[ABS_MAX + 1];
+	int ff_effects_max;
+	int absmax[ABS_CNT];
+	int absmin[ABS_CNT];
+	int absfuzz[ABS_CNT];
+	int absflat[ABS_CNT];
 };
 #endif	/* __UINPUT_H_ */