aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-02-18 11:08:18 +0100
committerHans Verkuil <hans.verkuil@cisco.com>2018-02-18 11:08:18 +0100
commit4665ab1fbab1ddaa5696bc3f5865ec6fc83eaf84 (patch)
tree9f6731c31edcae52e7fab0b9b8e094fa954b3a28 /contrib
parent432d9ebfcea65337647fd4e458f76b0417ea1c2f (diff)
v4l-utils: sync-with-kernel
Update to the latest kernel changes. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/freebsd/include/linux/input-event-codes.h1
-rw-r--r--contrib/freebsd/include/linux/input.h11
2 files changed, 12 insertions, 0 deletions
diff --git a/contrib/freebsd/include/linux/input-event-codes.h b/contrib/freebsd/include/linux/input-event-codes.h
index aa04673c..b880545c 100644
--- a/contrib/freebsd/include/linux/input-event-codes.h
+++ b/contrib/freebsd/include/linux/input-event-codes.h
@@ -594,6 +594,7 @@
#define BTN_DPAD_RIGHT 0x223
#define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */
+#define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */
#define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */
#define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */
diff --git a/contrib/freebsd/include/linux/input.h b/contrib/freebsd/include/linux/input.h
index ff968e52..f49aa563 100644
--- a/contrib/freebsd/include/linux/input.h
+++ b/contrib/freebsd/include/linux/input.h
@@ -55,10 +55,21 @@ typedef int8_t __s8;
/*
* The event structure itself
+ * Note that __USE_TIME_BITS64 is defined by libc based on
+ * application's request to use 64 bit time_t.
*/
struct input_event {
+#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL)
struct timeval time;
+#define input_event_sec time.tv_sec
+#define input_event_usec time.tv_usec
+#else
+ __kernel_ulong_t __sec;
+ __kernel_ulong_t __usec;
+#define input_event_sec __sec
+#define input_event_usec __usec
+#endif
__u16 type;
__u16 code;
__s32 value;

Privacy Policy