From 2ea8935b867e3e9183b769a7814441bed486047b Mon Sep 17 00:00:00 2001 From: Maxim Levitsky Date: Sat, 31 Jul 2010 11:59:18 -0300 Subject: [PATCH] --- yaml --- r: 208157 b: refs/heads/master c: 39b2c0687b238d8bce19d5e8c0c8dc4e7fe50ed4 h: refs/heads/master i: 208155: 6057cc839ba3c5cedbb2e21eb22389f69839825a v: v3 --- [refs] | 2 +- trunk/drivers/media/IR/ir-jvc-decoder.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f6feae602e83..222582e29c97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d2cb1de8e81ffc06df67853be5ead3556d3a6b5 +refs/heads/master: 39b2c0687b238d8bce19d5e8c0c8dc4e7fe50ed4 diff --git a/trunk/drivers/media/IR/ir-jvc-decoder.c b/trunk/drivers/media/IR/ir-jvc-decoder.c index 8894d8b36048..77a89c4de014 100644 --- a/trunk/drivers/media/IR/ir-jvc-decoder.c +++ b/trunk/drivers/media/IR/ir-jvc-decoder.c @@ -32,6 +32,7 @@ enum jvc_state { STATE_BIT_SPACE, STATE_TRAILER_PULSE, STATE_TRAILER_SPACE, + STATE_CHECK_REPEAT, }; /** @@ -60,6 +61,7 @@ static int ir_jvc_decode(struct input_dev *input_dev, struct ir_raw_event ev) IR_dprintk(2, "JVC decode started at state %d (%uus %s)\n", data->state, TO_US(ev.duration), TO_STR(ev.pulse)); +again: switch (data->state) { case STATE_INACTIVE: @@ -149,8 +151,18 @@ static int ir_jvc_decode(struct input_dev *input_dev, struct ir_raw_event ev) } data->count = 0; - data->state = STATE_BIT_PULSE; + data->state = STATE_CHECK_REPEAT; return 0; + + case STATE_CHECK_REPEAT: + if (!ev.pulse) + break; + + if (eq_margin(ev.duration, JVC_HEADER_PULSE, JVC_UNIT / 2)) + data->state = STATE_INACTIVE; + else + data->state = STATE_BIT_PULSE; + goto again; } out: