Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86fe1ac0 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files

media: rc: simplify ir_raw_event_store_edge() 



Since commit 12749b198fa4 ("[media] rc: saa7134: add trailing space for
timely decoding"), the workaround of inserting reset events is no
longer needed.

Note that the initial reset is not needed either; other rc-core drivers
that don't use ir_raw_event_store_edge() never call this at all.

Verified on a HVR-1150 and Raspberry Pi.

Fixes: 3f5c4c73 ("[media] rc: fix ghost keypresses with certain hw")

Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 48b2de19

drivers/media/pci/saa7134/saa7134-input.c

+1 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,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);



	return 1;

}

drivers/media/rc/gpio-ir-recv.c

+1 −5
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ 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;



	gval = gpio_get_value(gpio_dev->gpio_nr);
@@ -86,10 +85,7 @@ static irqreturn_t gpio_ir_recv_irq(int irq, void *dev_id) 
	if (gpio_dev->active_low)

		gval = !gval;



	if (gval == 1)

		type = IR_PULSE;



	rc = ir_raw_event_store_edge(gpio_dev->rcdev, type);

	rc = ir_raw_event_store_edge(gpio_dev->rcdev, gval == 1);

	if (rc < 0)

		goto err_get_value;

drivers/media/rc/img-ir/img-ir-raw.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

drivers/media/rc/rc-core-priv.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

	/* edge driver */

	struct timer_list edge_handle;

drivers/media/rc/rc-ir-raw.c

+5 −26
Original line number Diff line number Diff line
@@ -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]);



	/* 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;

	ev.duration = ktime_sub(now, dev->raw->last_event);

	ev.pulse = !pulse;



	if (type & IR_START_EVENT)

		ir_raw_event_reset(dev);

	else if (dev->raw->last_type & IR_SPACE) {

		ev.pulse = false;

		rc = ir_raw_event_store(dev, &ev);

	} else if (dev->raw->last_type & IR_PULSE) {

		ev.pulse = true;

	rc = ir_raw_event_store(dev, &ev);

	} else

		return 0;



	dev->raw->last_event = now;

	dev->raw->last_type = type;



	/* timer could be set to timeout (125ms by default) */

	if (!timer_pending(&dev->raw->edge_handle) ||