diff options
| author | David Härdeman | 2014-04-04 01:32:31 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-07-26 00:10:44 +0200 |
| commit | e87b540be2dd02552fb9244d50ae8b4e4619a34b (patch) | |
| tree | 4440e341a8b937890c7a772fa709a1063ade3ef9 /drivers/media/rc/rc-core-priv.h | |
| parent | [media] rc-core: rename dev->scanmask to dev->scancode_mask (diff) | |
| download | kernel-qcow2-linux-e87b540be2dd02552fb9244d50ae8b4e4619a34b.tar.gz kernel-qcow2-linux-e87b540be2dd02552fb9244d50ae8b4e4619a34b.tar.xz kernel-qcow2-linux-e87b540be2dd02552fb9244d50ae8b4e4619a34b.zip | |
[media] rc-core: merge rc5 and streamzap decoders
Now that the protocol is part of the scancode, it is pretty easy to merge
the rc5 and streamzap decoders. An additional advantage is that the decoder
is now stricter as it waits for the trailing silence before determining that
a command is a valid rc5/streamzap command (which avoids collisions that I've
seen with e.g. Sony protocols).
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/rc/rc-core-priv.h')
| -rw-r--r-- | drivers/media/rc/rc-core-priv.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h index da536c93c978..dea7aff15a35 100644 --- a/drivers/media/rc/rc-core-priv.h +++ b/drivers/media/rc/rc-core-priv.h @@ -54,7 +54,7 @@ struct ir_raw_event_ctrl { int state; u32 bits; unsigned count; - unsigned wanted_bits; + bool is_rc5x; } rc5; struct rc6_dec { int state; @@ -77,12 +77,6 @@ struct ir_raw_event_ctrl { bool first; bool toggle; } jvc; - struct rc5_sz_dec { - int state; - u32 bits; - unsigned count; - unsigned wanted_bits; - } rc5_sz; struct sanyo_dec { int state; unsigned count; |