aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/IR/ir-raw-event.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-03-21 13:00:55 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-18 00:52:58 -0300
commit9f1547829a6f39fe6b2da22653dff40502f3d568 (patch)
tree71c200ea5be13eef6b96f8e2290f0d2ba7792a09 /drivers/media/IR/ir-raw-event.c
parentada39630c758c5c3098f4fc1361103ea2bc1afe0 (diff)
V4L/DVB: saa7134: don't wait too much to generate an IR event on raw_decode
At raw_decode mode, the key is processed after the end of a timer. The previous code resets the timer every time something is received at the IR port. While this works fine with IR's that don't implement repeat, like Avermedia RM-JX IR, it keeps waiting until keydown, on IR's that implement NEC repeat command, like the Terratec yellow. The solution is to change the behaviour to do the timeout after the first received data. The timeout is currently set to 15 ms, as it works fine with NEC protcocol. It may need some adjustments to support other protocols and to better handle spurious detections that may happen with some IR sensors. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/IR/ir-raw-event.c')
-rw-r--r--drivers/media/IR/ir-raw-event.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/IR/ir-raw-event.c
index 9c71ac85892..0ae55433cef 100644
--- a/drivers/media/IR/ir-raw-event.c
+++ b/drivers/media/IR/ir-raw-event.c
@@ -17,6 +17,13 @@
/* Define the max number of bit transitions per IR keycode */
#define MAX_IR_EVENT_SIZE 256
+static void ir_keyup_timer(unsigned long data)
+{
+ struct input_dev *input_dev = (struct input_dev *)data;
+
+ ir_keyup(input_dev);
+}
+
int ir_raw_event_register(struct input_dev *input_dev)
{
struct ir_input_dev *ir = input_get_drvdata(input_dev);
@@ -27,6 +34,11 @@ int ir_raw_event_register(struct input_dev *input_dev)
size = sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE * 2;
size = roundup_pow_of_two(size);
+ init_timer(&ir->raw->timer_keyup);
+ ir->raw->timer_keyup.function = ir_keyup_timer;
+ ir->raw->timer_keyup.data = (unsigned long)input_dev;
+ set_bit(EV_REP, input_dev->evbit);
+
rc = kfifo_alloc(&ir->raw->kfifo, size, GFP_KERNEL);
return rc;
@@ -40,6 +52,8 @@ void ir_raw_event_unregister(struct input_dev *input_dev)
if (!ir->raw)
return;
+ del_timer_sync(&ir->raw->timer_keyup);
+
kfifo_free(&ir->raw->kfifo);
kfree(ir->raw);
ir->raw = NULL;