[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>

diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 9427fad..9d15a57 100644 (file)
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -84,18 +84,6 @@ config IR_SONY_DECODER
           Enable this option if you have an infrared remote control which
           uses the Sony protocol, and you need software decoding support.
 
-config IR_RC5_SZ_DECODER
-       tristate "Enable IR raw decoder for the RC-5 (streamzap) protocol"
-       depends on RC_CORE
-       select BITREVERSE
-       default y
-
-       ---help---
-          Enable this option if you have IR with RC-5 (streamzap) protocol,
-          and if the IR is decoded in software. (The Streamzap PC Remote
-          uses an IR protocol that is almost standard RC-5, but not quite,
-          as it uses an additional bit).
-
 config IR_SANYO_DECODER
        tristate "Enable IR raw decoder for the Sanyo protocol"
        depends on RC_CORE

diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 9ee9ee7..d07576f 100644 (file)
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -9,7 +9,6 @@ obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o
 obj-$(CONFIG_IR_RC6_DECODER) += ir-rc6-decoder.o
 obj-$(CONFIG_IR_JVC_DECODER) += ir-jvc-decoder.o
 obj-$(CONFIG_IR_SONY_DECODER) += ir-sony-decoder.o
-obj-$(CONFIG_IR_RC5_SZ_DECODER) += ir-rc5-sz-decoder.o
 obj-$(CONFIG_IR_SANYO_DECODER) += ir-sanyo-decoder.o
 obj-$(CONFIG_IR_SHARP_DECODER) += ir-sharp-decoder.o
 obj-$(CONFIG_IR_MCE_KBD_DECODER) += ir-mce_kbd-decoder.o

diff --cc drivers/media/rc/ir-rc5-decoder.c
Simple merge

diff --cc drivers/media/rc/ir-rc5-sz-decoder.c
Simple merge

diff --cc drivers/media/rc/keymaps/rc-streamzap.c
Simple merge

diff --cc drivers/media/rc/rc-core-priv.h
Simple merge

diff --cc drivers/media/rc/streamzap.c
Simple merge