Re: [PATCH v2 21/25] media: lirc: introduce LIRC_SET_POLL_MODE
On Mon, Oct 09, 2017 at 12:50:19PM +0200, Hans Verkuil wrote: > On 05/10/17 10:45, Sean Young wrote: > > If you want to poll for both decoded scancodes and raw IR, then this > > ioctl will help you. > > I don't get the point of this. You can be in one mode at a time anyway, > so why not just poll for the current mode? Well, you might want to poll for the current mode and another mode. Actually, I think the ioctl should be called LIRC_SET_POLL_MODES to clarify that. So say if I want to poll for raw IR (LIRC_MODE_MODE2) and decoded scancodes (LIRC_MODE_SCANCODES), then without this ioctl, I would have to poll one for a period, then switch modes, poll for the other, switch modes, ad infinitum. > > > > > int fd = open("/dev/lirc0", O_RDONLY | O_NONBLOCK); > > > > for (;;) { > > unsigned mode = LIRC_MODE_SCANCODE | LIRC_MODE_MODE2; > > ioctl(fd, LIRC_SET_POLL_MODE, ); > > poll(&((struct pollfd){ .fd = fd, .events = POLLIN }), 1, -1); > > mode = LIRC_MODE_SCANCODE; > > ioctl(fd, LIRC_SET_REC_MODE, ); > > Hold on, in a comment below I read that rec_mode stands for 'recording mode'. > Is that right, or should it be 'receive mode'? You're right, I've confused myself! Lirc calls it record and sometimes receive. > > struct lirc_scancode sc; > > if (read(fd, , 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, ); > > unsigned sample; > > if (read(fd, , 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> > --- > > Documentation/media/uapi/rc/lirc-func.rst | 1 + > > Documentation/media/uapi/rc/lirc-set-poll-mode.rst | 45 > > ++ > > drivers/media/rc/ir-lirc-codec.c | 19 +++-- > > drivers/media/rc/lirc_dev.c| 1 + > > include/media/rc-core.h| 3 ++ > > 5 files changed, 65 insertions(+), 4 deletions(-) > > create mode 100644 Documentation/media/uapi/rc/lirc-set-poll-mode.rst > > > > diff --git a/Documentation/media/uapi/rc/lirc-func.rst > > b/Documentation/media/uapi/rc/lirc-func.rst > > index ddb4620de294..a09fb03f6722 100644 > > --- a/Documentation/media/uapi/rc/lirc-func.rst > > +++ b/Documentation/media/uapi/rc/lirc-func.rst > > @@ -25,3 +25,4 @@ LIRC Function Reference > > lirc-set-rec-timeout-reports > > lirc-set-measure-carrier-mode > > lirc-set-wideband-receiver > > +lirc-set-poll-mode > > diff --git a/Documentation/media/uapi/rc/lirc-set-poll-mode.rst > > b/Documentation/media/uapi/rc/lirc-set-poll-mode.rst > > new file mode 100644 > > index ..ce5043e8acba > > --- /dev/null > > +++ b/Documentation/media/uapi/rc/lirc-set-poll-mode.rst > > @@ -0,0 +1,45 @@ > > +.. -*- coding: utf-8; mode: rst -*- > > + > > +.. _lirc_set_poll_mode: > > + > > +** > > +ioctls LIRC_SET_POLL_MODE > > +** > > + > > +Name > > + > > + > > +LIRC_SET_POLL_MODE - Set LIRC modes to use for poll > > + > > +Synopsis > > + > > + > > +.. c:function:: int ioctl( int fd, LIRC_SET_POLL_MODE, __u32 modes) > > + :name: LIRC_SET_POLL_MODE > > + > > +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 ` and > > +:ref:`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. > > + > > +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 ` chapter. > > diff --git a/drivers/media/rc/ir-lirc-codec.c > > b/drivers/media/rc/ir-lirc-codec.c > > index 2544ddc078ca..1f1811c080af 100644 > > --- a/drivers/media/rc/ir-lirc-codec.c > > +++ b/drivers/media/rc/ir-lirc-codec.c > > @@ -353,6 +353,17 @@ static long ir_lirc_ioctl(struct file *filep, unsigned > > int cmd, > > return -EINVAL; > > > > dev->rec_mode = val; > > + dev->poll_mode = val; > > + return 0; > > + > >
Re: [PATCH v2 21/25] media: lirc: introduce LIRC_SET_POLL_MODE
On 05/10/17 10:45, Sean Young wrote: > If you want to poll for both decoded scancodes and raw IR, then this > ioctl will help you. I don't get the point of this. You can be in one mode at a time anyway, so why not just poll for the current mode? > > int fd = open("/dev/lirc0", O_RDONLY | O_NONBLOCK); > > for (;;) { > unsigned mode = LIRC_MODE_SCANCODE | LIRC_MODE_MODE2; > ioctl(fd, LIRC_SET_POLL_MODE, ); > poll(&((struct pollfd){ .fd = fd, .events = POLLIN }), 1, -1); > mode = LIRC_MODE_SCANCODE; > ioctl(fd, LIRC_SET_REC_MODE, ); Hold on, in a comment below I read that rec_mode stands for 'recording mode'. Is that right, or should it be 'receive mode'? > struct lirc_scancode sc; > if (read(fd, , 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, ); > unsigned sample; > if (read(fd, , 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> --- > Documentation/media/uapi/rc/lirc-func.rst | 1 + > Documentation/media/uapi/rc/lirc-set-poll-mode.rst | 45 > ++ > drivers/media/rc/ir-lirc-codec.c | 19 +++-- > drivers/media/rc/lirc_dev.c| 1 + > include/media/rc-core.h| 3 ++ > 5 files changed, 65 insertions(+), 4 deletions(-) > create mode 100644 Documentation/media/uapi/rc/lirc-set-poll-mode.rst > > diff --git a/Documentation/media/uapi/rc/lirc-func.rst > b/Documentation/media/uapi/rc/lirc-func.rst > index ddb4620de294..a09fb03f6722 100644 > --- a/Documentation/media/uapi/rc/lirc-func.rst > +++ b/Documentation/media/uapi/rc/lirc-func.rst > @@ -25,3 +25,4 @@ LIRC Function Reference > lirc-set-rec-timeout-reports > lirc-set-measure-carrier-mode > lirc-set-wideband-receiver > +lirc-set-poll-mode > diff --git a/Documentation/media/uapi/rc/lirc-set-poll-mode.rst > b/Documentation/media/uapi/rc/lirc-set-poll-mode.rst > new file mode 100644 > index ..ce5043e8acba > --- /dev/null > +++ b/Documentation/media/uapi/rc/lirc-set-poll-mode.rst > @@ -0,0 +1,45 @@ > +.. -*- coding: utf-8; mode: rst -*- > + > +.. _lirc_set_poll_mode: > + > +** > +ioctls LIRC_SET_POLL_MODE > +** > + > +Name > + > + > +LIRC_SET_POLL_MODE - Set LIRC modes to use for poll > + > +Synopsis > + > + > +.. c:function:: int ioctl( int fd, LIRC_SET_POLL_MODE, __u32 modes) > + :name: LIRC_SET_POLL_MODE > + > +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 ` and > +:ref:`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. > + > +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 ` chapter. > diff --git a/drivers/media/rc/ir-lirc-codec.c > b/drivers/media/rc/ir-lirc-codec.c > index 2544ddc078ca..1f1811c080af 100644 > --- a/drivers/media/rc/ir-lirc-codec.c > +++ b/drivers/media/rc/ir-lirc-codec.c > @@ -353,6 +353,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_MODE: > + 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: > @@ -495,13 +506,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) && >
[PATCH v2 21/25] media: lirc: introduce LIRC_SET_POLL_MODE
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_MODE, ); poll(&((struct pollfd){ .fd = fd, .events = POLLIN }), 1, -1); mode = LIRC_MODE_SCANCODE; ioctl(fd, LIRC_SET_REC_MODE, ); struct lirc_scancode sc; if (read(fd, , 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, ); unsigned sample; if (read(fd, , 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--- Documentation/media/uapi/rc/lirc-func.rst | 1 + Documentation/media/uapi/rc/lirc-set-poll-mode.rst | 45 ++ drivers/media/rc/ir-lirc-codec.c | 19 +++-- drivers/media/rc/lirc_dev.c| 1 + include/media/rc-core.h| 3 ++ 5 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 Documentation/media/uapi/rc/lirc-set-poll-mode.rst diff --git a/Documentation/media/uapi/rc/lirc-func.rst b/Documentation/media/uapi/rc/lirc-func.rst index ddb4620de294..a09fb03f6722 100644 --- a/Documentation/media/uapi/rc/lirc-func.rst +++ b/Documentation/media/uapi/rc/lirc-func.rst @@ -25,3 +25,4 @@ LIRC Function Reference lirc-set-rec-timeout-reports lirc-set-measure-carrier-mode lirc-set-wideband-receiver +lirc-set-poll-mode diff --git a/Documentation/media/uapi/rc/lirc-set-poll-mode.rst b/Documentation/media/uapi/rc/lirc-set-poll-mode.rst new file mode 100644 index ..ce5043e8acba --- /dev/null +++ b/Documentation/media/uapi/rc/lirc-set-poll-mode.rst @@ -0,0 +1,45 @@ +.. -*- coding: utf-8; mode: rst -*- + +.. _lirc_set_poll_mode: + +** +ioctls LIRC_SET_POLL_MODE +** + +Name + + +LIRC_SET_POLL_MODE - Set LIRC modes to use for poll + +Synopsis + + +.. c:function:: int ioctl( int fd, LIRC_SET_POLL_MODE, __u32 modes) + :name: LIRC_SET_POLL_MODE + +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 ` and +:ref:`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. + +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 ` chapter. diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c index 2544ddc078ca..1f1811c080af 100644 --- a/drivers/media/rc/ir-lirc-codec.c +++ b/drivers/media/rc/ir-lirc-codec.c @@ -353,6 +353,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_MODE: + 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: @@ -495,13 +506,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(>scancodes)) - events = POLLIN | POLLRDNORM; + events |= POLLIN | POLLRDNORM; - if (rcdev->rec_mode == LIRC_MODE_MODE2 && + if ((rcdev->poll_mode & LIRC_MODE_MODE2) && !kfifo_is_empty(>rawir)) - events = POLLIN | POLLRDNORM; + events |= POLLIN | POLLRDNORM; } return events; diff --git a/drivers/media/rc/lirc_dev.c