aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-04-24 09:34:55 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2018-04-24 09:34:55 +0200
commit07c64b22e8564b0e6d41516a2d6c4441fc630625 (patch)
treef7a1bccb4df1cf9cb7e2cb78822f1a260a22b6ab /include
parent9efc4a32405286255269c459deb119eb07d6298b (diff)
v4l-utils: sync with media master branch
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/lirc.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/lirc.h b/include/linux/lirc.h
index 948d9a49..6b319581 100644
--- a/include/linux/lirc.h
+++ b/include/linux/lirc.h
@@ -54,7 +54,6 @@
#define LIRC_CAN_SEND_RAW LIRC_MODE2SEND(LIRC_MODE_RAW)
#define LIRC_CAN_SEND_PULSE LIRC_MODE2SEND(LIRC_MODE_PULSE)
#define LIRC_CAN_SEND_MODE2 LIRC_MODE2SEND(LIRC_MODE_MODE2)
-#define LIRC_CAN_SEND_SCANCODE LIRC_MODE2SEND(LIRC_MODE_SCANCODE)
#define LIRC_CAN_SEND_LIRCCODE LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
#define LIRC_CAN_SEND_MASK 0x0000003f
@@ -135,6 +134,12 @@
#define LIRC_SET_WIDEBAND_RECEIVER _IOW('i', 0x00000023, __u32)
/*
+ * Return the recording timeout, which is either set by
+ * the ioctl LIRC_SET_REC_TIMEOUT or by the kernel after setting the protocols.
+ */
+#define LIRC_GET_REC_TIMEOUT _IOR('i', 0x00000024, __u32)
+
+/*
* struct lirc_scancode - decoded scancode with protocol for use with
* LIRC_MODE_SCANCODE
*

Privacy Policy