summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/keymaps
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2014-04-03 20:32:31 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-25 19:10:44 -0300
commite87b540be2dd02552fb9244d50ae8b4e4619a34b (patch)
tree4440e341a8b937890c7a772fa709a1063ade3ef9 /drivers/media/rc/keymaps
parent9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36 (diff)
downloadblackbird-obmc-linux-e87b540be2dd02552fb9244d50ae8b4e4619a34b.tar.gz
blackbird-obmc-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/keymaps')
-rw-r--r--drivers/media/rc/keymaps/rc-streamzap.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/rc/keymaps/rc-streamzap.c b/drivers/media/rc/keymaps/rc-streamzap.c
index f9a07578d985..23c061174ed7 100644
--- a/drivers/media/rc/keymaps/rc-streamzap.c
+++ b/drivers/media/rc/keymaps/rc-streamzap.c
@@ -15,9 +15,7 @@
static struct rc_map_table streamzap[] = {
/*
* The Streamzap remote is almost, but not quite, RC-5, as it has an extra
- * bit in it, which throws the in-kernel RC-5 decoder for a loop. Currently,
- * an additional RC-5-sz decoder is being deployed to support it, but it
- * may be possible to merge it back with the standard RC-5 decoder.
+ * bit in it.
*/
{ 0x28c0, KEY_NUMERIC_0 },
{ 0x28c1, KEY_NUMERIC_1 },
OpenPOWER on IntegriCloud