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

Commit 3c1c48bb authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (12465): cx88: High resolution timer for Remote Controls 

Patch solves problem of missed keystrokes on some remote controls,
as reported on http://bugzilla.kernel.org/show_bug.cgi?id=9637

 .

Signed-off-by: default avatarAndrzej Hajda <andrzej.hajda@wp.pl>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ecfcfec8

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Original line Diff line number Diff line
@@ -167,3 +167,4 @@ 
166 -> Beholder BeholdTV 607 RDS                [5ace:6073]

166 -> Beholder BeholdTV 607 RDS                [5ace:6073]

167 -> Beholder BeholdTV 609 RDS                [5ace:6092]

167 -> Beholder BeholdTV 609 RDS                [5ace:6092]

168 -> Beholder BeholdTV 609 RDS                [5ace:6093]

168 -> Beholder BeholdTV 609 RDS                [5ace:6093]

169 -> Compro VideoMate S350/S300               [185b:c900]

drivers/media/video/cx88/cx88-input.c

+17 −8
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
 */

 */





#include <linux/init.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/hrtimer.h>

#include <linux/input.h>

#include <linux/input.h>

#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/module.h>

#include <linux/module.h>
@@ -48,7 +48,7 @@ struct cx88_IR { 




	/* poll external decoder */

	/* poll external decoder */

	int polling;

	int polling;

	struct delayed_work work;

	struct hrtimer timer;

	u32 gpio_addr;

	u32 gpio_addr;

	u32 last_gpio;

	u32 last_gpio;

	u32 mask_keycode;

	u32 mask_keycode;
@@ -144,19 +144,28 @@ static void cx88_ir_handle_key(struct cx88_IR *ir) 
	}

	}

}

}





static void cx88_ir_work(struct work_struct *work)

static enum hrtimer_restart cx88_ir_work(struct hrtimer *timer)

{

{

	struct cx88_IR *ir = container_of(work, struct cx88_IR, work.work);

	unsigned long missed;

	struct cx88_IR *ir = container_of(timer, struct cx88_IR, timer);





	cx88_ir_handle_key(ir);

	cx88_ir_handle_key(ir);

	schedule_delayed_work(&ir->work, msecs_to_jiffies(ir->polling));

	missed = hrtimer_forward_now(&ir->timer,

				     ktime_set(0, ir->polling * 1000000));

	if (missed > 1)

		ir_dprintk("Missed ticks %ld\n", missed - 1);



	return HRTIMER_RESTART;

}

}





void cx88_ir_start(struct cx88_core *core, struct cx88_IR *ir)

void cx88_ir_start(struct cx88_core *core, struct cx88_IR *ir)

{

{

	if (ir->polling) {

	if (ir->polling) {

		INIT_DELAYED_WORK(&ir->work, cx88_ir_work);

		hrtimer_init(&ir->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

		schedule_delayed_work(&ir->work, 0);

		ir->timer.function = cx88_ir_work;

		hrtimer_start(&ir->timer,

			      ktime_set(0, ir->polling * 1000000),

			      HRTIMER_MODE_REL);

	}

	}

	if (ir->sampling) {

	if (ir->sampling) {

		core->pci_irqmask |= PCI_INT_IR_SMPINT;

		core->pci_irqmask |= PCI_INT_IR_SMPINT;
@@ -173,7 +182,7 @@ void cx88_ir_stop(struct cx88_core *core, struct cx88_IR *ir) 
	}

	}





	if (ir->polling)

	if (ir->polling)

		cancel_delayed_work_sync(&ir->work);

		hrtimer_cancel(&ir->timer);

}

}





/* ---------------------------------------------------------------------- */

/* ---------------------------------------------------------------------- */