@@ -25,3 +25,4 @@ LIRC Function Reference
lirc-set-rec-timeout-reports
lirc-set-measure-carrier-mode
lirc-set-wideband-receiver
+ lirc-set-poll-modes
new file mode 100644
@@ -0,0 +1,52 @@
+.. -*- coding: utf-8; mode: rst -*-
+
+.. _lirc_set_poll_modes:
+
+**********************************************
+ioctls LIRC_SET_POLL_MODES
+**********************************************
+
+Name
+====
+
+LIRC_SET_POLL_MODES - Set LIRC modes to use for poll
+
+Synopsis
+========
+
+.. c:function:: int ioctl( int fd, LIRC_SET_POLL_MODES, __u32 modes)
+ :name: LIRC_SET_POLL_MODES
+
+Arguments
+=========
+
+``fd``
+ File descriptor returned by open().
+
+``modes``
+ Bitmask with enabled poll lirc modes
+
+Description
+===========
+
+Set lirc modes for which read readiness is reported by poll. Only
+:ref:`LIRC_MODE_MODE2 <lirc-mode-mode2>` and
+:ref:`LIRC_MODE_SCANCODE <lirc-mode-scancode>` are supported. Poll
+can report read readiness for both modes if you bitwise or them together.
+Use :ref:`lirc_get_features` to find out which modes the driver supports.
+
+This ioctl is useful when you want to read both raw IR and decoded
+scancodes. You can set :ref:`LIRC_MODE_MODE2 <lirc-mode-mode2>` and
+poll for raw IR for some time, and then set
+:ref:`LIRC_MODE_SCANCODE <lirc-mode-scancode>` and poll for decoded
+scancodes, and repeat both modes again. Using this ioctl, you can poll
+for both without having to wait for a limited period in each mode.
+
+Note that using :ref:`lirc_set_rec_mode` resets the poll mode.
+
+Return Value
+============
+
+On success 0 is returned, on error -1 and the ``errno`` variable is set
+appropriately. The generic error codes are described at the
+:ref:`Generic Error Codes <gen-errors>` chapter.
@@ -351,6 +351,17 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
return -EINVAL;
dev->rec_mode = val;
+ dev->poll_mode = val;
+ return 0;
+
+ case LIRC_SET_POLL_MODES:
+ if (dev->driver_type == RC_DRIVER_IR_RAW_TX)
+ return -ENOTTY;
+
+ if (val & ~(LIRC_MODE_MODE2 | LIRC_MODE_SCANCODE))
+ return -EINVAL;
+
+ dev->poll_mode = val;
return 0;
case LIRC_GET_SEND_MODE:
@@ -493,13 +504,13 @@ static unsigned int ir_lirc_poll(struct file *file,
if (!rcdev->registered) {
events = POLLHUP | POLLERR;
} else if (rcdev->driver_type != RC_DRIVER_IR_RAW_TX) {
- if (rcdev->rec_mode == LIRC_MODE_SCANCODE &&
+ if ((rcdev->poll_mode & LIRC_MODE_SCANCODE) &&
!kfifo_is_empty(&rcdev->scancodes))
- events = POLLIN | POLLRDNORM;
+ events |= POLLIN | POLLRDNORM;
- if (rcdev->rec_mode == LIRC_MODE_MODE2 &&
+ if ((rcdev->poll_mode & LIRC_MODE_MODE2) &&
!kfifo_is_empty(&rcdev->rawir))
- events = POLLIN | POLLRDNORM;
+ events |= POLLIN | POLLRDNORM;
}
return events;
@@ -58,6 +58,7 @@ int ir_lirc_register(struct rc_dev *dev)
dev->send_mode = LIRC_MODE_PULSE;
dev->rec_mode = LIRC_MODE_MODE2;
+ dev->poll_mode = LIRC_MODE_MODE2;
if (dev->driver_type == RC_DRIVER_IR_RAW) {
if (kfifo_alloc(&dev->rawir, MAX_IR_EVENT_SIZE, GFP_KERNEL))
@@ -132,6 +132,8 @@ enum rc_filter_type {
* LIRC_MODE_PULSE
* @rec_mode: lirc mode for receiving, either LIRC_MODE_SCANCODE or
* LIRC_MODE_MODE2
+ * @poll_mode: lirc mode used for polling, can poll for both LIRC_MODE_SCANCODE
+ * and LIRC_MODE_MODE2
* @registered: set to true by rc_register_device(), false by
* rc_unregister_device
* @change_protocol: allow changing the protocol used on hardware decoders
@@ -207,6 +209,7 @@ struct rc_dev {
wait_queue_head_t wait_poll;
u8 send_mode;
u8 rec_mode;
+ u8 poll_mode;
#endif
bool registered;
int (*change_protocol)(struct rc_dev *dev, u64 *rc_proto);
@@ -134,6 +134,15 @@
#define LIRC_SET_WIDEBAND_RECEIVER _IOW('i', 0x00000023, __u32)
/*
+ * For raw IR devices, both raw IR (LIRC_MODE_MODE2) and decodes scancodes
+ * (LIRC_MODE_SCANCODE) can be read. By default, poll will show read
+ * ready for the last mode set by LIRC_SET_REC_MODE. Use LIRC_SET_POLL_MODE
+ * LIRC_MODE_SCANCODE | LIRC_MODE_MODE2 to show read ready for both
+ * modes.
+ */
+#define LIRC_SET_POLL_MODES _IOW('i', 0x00000024, __u32)
+
+/*
* struct lirc_scancode - decoded scancode with protocol for use with
* LIRC_MODE_SCANCODE
*
If you want to poll for both decoded scancodes and raw IR, then this ioctl will help you. int fd = open("/dev/lirc0", O_RDONLY | O_NONBLOCK); for (;;) { unsigned mode = LIRC_MODE_SCANCODE | LIRC_MODE_MODE2; ioctl(fd, LIRC_SET_POLL_MODES, &mode); poll(&((struct pollfd){ .fd = fd, .events = POLLIN }), 1, -1); mode = LIRC_MODE_SCANCODE; ioctl(fd, LIRC_SET_REC_MODE, &mode); struct lirc_scancode sc; if (read(fd, &sc, sizeof(sc)) == sizeof(sc)) { printf("scancode protocol:%d scancode:%llx\n", sc.rc_proto, sc.scancode); } mode = LIRC_MODE_MODE2; ioctl(fd, LIRC_SET_REC_MODE, &mode); unsigned sample; if (read(fd, &sample, sizeof(sample)) == sizeof(sample)) { if (LIRC_IS_SPACE(sample)) printf("space %u\n", LIRC_VAL(sample))); if (LIRC_IS_PULSE(sample)) printf("pulse %u\n", LIRC_VAL(sample))); } } Note that LIRC_SET_REC_MODE will also affect the poll mode, so you must set it again before calling poll. Signed-off-by: Sean Young <sean@mess.org> --- Documentation/media/uapi/rc/lirc-func.rst | 1 + .../media/uapi/rc/lirc-set-poll-modes.rst | 52 ++++++++++++++++++++++ drivers/media/rc/ir-lirc-codec.c | 19 ++++++-- drivers/media/rc/lirc_dev.c | 1 + include/media/rc-core.h | 3 ++ include/uapi/linux/lirc.h | 9 ++++ 6 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 Documentation/media/uapi/rc/lirc-set-poll-modes.rst