media: rc-core: consistent use of rc_repeat()
The NEC decoder and the Sanyo decoders check if dev->keypressed is true before calling rc_repeat (without holding dev->keylock). Meanwhile, the XMP and JVC decoders do no such checks. This patch makes sure all users of rc_repeat() do so consistently by removing extra checks in NEC/Sanyo and modifying the check a bit in rc_repeat() so that no input event is generated if the key isn't pressed. Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
parent
ab45e85851
commit
265a2988d2
|
@ -88,13 +88,9 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
||||||
data->state = STATE_BIT_PULSE;
|
data->state = STATE_BIT_PULSE;
|
||||||
return 0;
|
return 0;
|
||||||
} else if (eq_margin(ev.duration, NEC_REPEAT_SPACE, NEC_UNIT / 2)) {
|
} else if (eq_margin(ev.duration, NEC_REPEAT_SPACE, NEC_UNIT / 2)) {
|
||||||
if (!dev->keypressed) {
|
rc_repeat(dev);
|
||||||
IR_dprintk(1, "Discarding last key repeat: event after key up\n");
|
IR_dprintk(1, "Repeat last key\n");
|
||||||
} else {
|
data->state = STATE_TRAILER_PULSE;
|
||||||
rc_repeat(dev);
|
|
||||||
IR_dprintk(1, "Repeat last key\n");
|
|
||||||
data->state = STATE_TRAILER_PULSE;
|
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -110,13 +110,9 @@ static int ir_sanyo_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (!data->count && geq_margin(ev.duration, SANYO_REPEAT_SPACE, SANYO_UNIT / 2)) {
|
if (!data->count && geq_margin(ev.duration, SANYO_REPEAT_SPACE, SANYO_UNIT / 2)) {
|
||||||
if (!dev->keypressed) {
|
rc_repeat(dev);
|
||||||
IR_dprintk(1, "SANYO discarding last key repeat: event after key up\n");
|
IR_dprintk(1, "SANYO repeat last key\n");
|
||||||
} else {
|
data->state = STATE_INACTIVE;
|
||||||
rc_repeat(dev);
|
|
||||||
IR_dprintk(1, "SANYO repeat last key\n");
|
|
||||||
data->state = STATE_INACTIVE;
|
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -616,12 +616,12 @@ void rc_repeat(struct rc_dev *dev)
|
||||||
|
|
||||||
spin_lock_irqsave(&dev->keylock, flags);
|
spin_lock_irqsave(&dev->keylock, flags);
|
||||||
|
|
||||||
input_event(dev->input_dev, EV_MSC, MSC_SCAN, dev->last_scancode);
|
|
||||||
input_sync(dev->input_dev);
|
|
||||||
|
|
||||||
if (!dev->keypressed)
|
if (!dev->keypressed)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
input_event(dev->input_dev, EV_MSC, MSC_SCAN, dev->last_scancode);
|
||||||
|
input_sync(dev->input_dev);
|
||||||
|
|
||||||
dev->keyup_jiffies = jiffies + msecs_to_jiffies(IR_KEYPRESS_TIMEOUT);
|
dev->keyup_jiffies = jiffies + msecs_to_jiffies(IR_KEYPRESS_TIMEOUT);
|
||||||
mod_timer(&dev->timer_keyup, dev->keyup_jiffies);
|
mod_timer(&dev->timer_keyup, dev->keyup_jiffies);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue