On Sun, May 28, 2017 at 05:49:27PM +0100, Sean Young wrote:
> There is no need to called ir_raw_event_reset() either after a long
> space or on startup. Many rc drivers never do this.
>
> Signed-off-by: Sean Young <sean@xxxxxxxx>
> ---
> drivers/media/pci/saa7134/saa7134-input.c | 2 +-
> drivers/media/rc/gpio-ir-recv.c | 6 +++---
> drivers/media/rc/img-ir/img-ir-raw.c | 4 ++--
> drivers/media/rc/rc-core-priv.h | 1 -
> drivers/media/rc/rc-ir-raw.c | 31 +++++--------------------------
> include/media/rc-core.h | 9 +--------
> 6 files changed, 12 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/pci/saa7134/saa7134-input.c
> index 78849c1..8784bc8 100644
> --- a/drivers/media/pci/saa7134/saa7134-input.c
> +++ b/drivers/media/pci/saa7134/saa7134-input.c
> @@ -1064,7 +1064,7 @@ static int saa7134_raw_decode_irq(struct saa7134_dev *dev)
> saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
> saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
> space = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2) & ir->mask_keydown;
> - ir_raw_event_store_edge(dev->remote->dev, space ? IR_SPACE : IR_PULSE);
> + ir_raw_event_store_edge(dev->remote->dev, !space);
>
> /*
> * Wait 15 ms from the start of the first IR event before processing
> diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
> index b4f773b..09889d0 100644
> --- a/drivers/media/rc/gpio-ir-recv.c
> +++ b/drivers/media/rc/gpio-ir-recv.c
> @@ -77,7 +77,7 @@ static irqreturn_t gpio_ir_recv_irq(int irq, void *dev_id)
> struct gpio_rc_dev *gpio_dev = dev_id;
> int gval;
> int rc = 0;
> - enum raw_event_type type = IR_SPACE;
> + bool pulse = false;
>
> gval = gpio_get_value(gpio_dev->gpio_nr);
>
> @@ -88,9 +88,9 @@ static irqreturn_t gpio_ir_recv_irq(int irq, void *dev_id)
> gval = !gval;
>
> if (gval == 1)
> - type = IR_PULSE;
> + pulse = true;
>
> - rc = ir_raw_event_store_edge(gpio_dev->rcdev, type);
> + rc = ir_raw_event_store_edge(gpio_dev->rcdev, pulse);
> if (rc < 0)
> goto err_get_value;
>
> diff --git a/drivers/media/rc/img-ir/img-ir-raw.c b/drivers/media/rc/img-ir/img-ir-raw.c
> index 8d2f8e2..ddb7fb4 100644
> --- a/drivers/media/rc/img-ir/img-ir-raw.c
> +++ b/drivers/media/rc/img-ir/img-ir-raw.c
> @@ -40,9 +40,9 @@ static void img_ir_refresh_raw(struct img_ir_priv *priv, u32 irq_status)
>
> /* report the edge to the IR raw decoders */
> if (ir_status) /* low */
> - ir_raw_event_store_edge(rc_dev, IR_SPACE);
> + ir_raw_event_store_edge(rc_dev, false);
> else /* high */
> - ir_raw_event_store_edge(rc_dev, IR_PULSE);
> + ir_raw_event_store_edge(rc_dev, true);
> ir_raw_event_handle(rc_dev);
> }
>
> diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
> index 0455b27..d31ad6a 100644
> --- a/drivers/media/rc/rc-core-priv.h
> +++ b/drivers/media/rc/rc-core-priv.h
> @@ -41,7 +41,6 @@ struct ir_raw_event_ctrl {
> /* fifo for the pulse/space durations */
> DECLARE_KFIFO(kfifo, struct ir_raw_event, MAX_IR_EVENT_SIZE);
> ktime_t last_event; /* when last event occurred */
> - enum raw_event_type last_type; /* last event type */
> struct rc_dev *dev; /* pointer to the parent rc_dev */
>
> /* raw decoder state follows */
> diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
> index 90f66dc..16ef236 100644
> --- a/drivers/media/rc/rc-ir-raw.c
> +++ b/drivers/media/rc/rc-ir-raw.c
> @@ -88,7 +88,7 @@ EXPORT_SYMBOL_GPL(ir_raw_event_store);
> /**
> * ir_raw_event_store_edge() - notify raw ir decoders of the start of a pulse/space
> * @dev: the struct rc_dev device descriptor
> - * @type: the type of the event that has occurred
> + * @pulse: true for pulse, false for space
> *
> * This routine (which may be called from an interrupt context) is used to
> * store the beginning of an ir pulse or space (or the start/end of ir
> @@ -96,43 +96,22 @@ EXPORT_SYMBOL_GPL(ir_raw_event_store);
> * hardware which does not provide durations directly but only interrupts
> * (or similar events) on state change.
> */
> -int ir_raw_event_store_edge(struct rc_dev *dev, enum raw_event_type type)
> +int ir_raw_event_store_edge(struct rc_dev *dev, bool pulse)
> {
> ktime_t now;
> - s64 delta; /* ns */
> DEFINE_IR_RAW_EVENT(ev);
> int rc = 0;
> - int delay;
>
> if (!dev->raw)
> return -EINVAL;
>
> now = ktime_get();
> - delta = ktime_to_ns(ktime_sub(now, dev->raw->last_event));
> - delay = MS_TO_NS(dev->input_dev->rep[REP_DELAY]);
> + ev.duration = ktime_to_ns(ktime_sub(now, dev->raw->last_event));
> + ev.pulse = pulse;
>
> - /* Check for a long duration since last event or if we're
> - * being called for the first time, note that delta can't
> - * possibly be negative.
> - */
> - if (delta > delay || !dev->raw->last_type)
> - type |= IR_START_EVENT;
> - else
> - ev.duration = delta;
This change was added in commit 3f5c4c7 ("[media] rc: fix ghost keypresses
with certain hw"), so we can't just remove it. I've found the hardware
mentioned in the commit on ebay and try to figure out what is going on
once I get it.
Thanks
Sean
