V4L/DVB: IR/imon: convert to ir-core protocol change handling

Drop the imon driver's internal protocol definitions in favor of using
those provided by ir-core. Should make ir-keytable Just Work for
switching protocol on the fly on the imon devices that support both the
native imon remotes and mce remotes.

The imon-no-pad-stabilize pseudo-protocol was dropped as a protocol, and
converted to a separate modprobe option (which it probably should have
been in the first place). On the TODO list is to convert this to an as yet
unwritten protocol-specific options framework.

While the mce remotes obviously map to IR_TYPE_RC6, I've yet to look at
what the actual ir signals from the native imon remotes are, so for the
moment, imon native ir is mapped to IR_TYPE_OTHER. Nailing it down more
accurately is also on the TODO list.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/media/IR/keymaps/rc-imon-mce.c b/drivers/media/IR/keymaps/rc-imon-mce.c
index 9c6dda30c649..e49f350e3a0d 100644
--- a/drivers/media/IR/keymaps/rc-imon-mce.c
+++ b/drivers/media/IR/keymaps/rc-imon-mce.c
@@ -119,8 +119,8 @@ static struct rc_keymap imon_mce_map = {
         .map = {
                 .scan    = imon_mce,
                 .size    = ARRAY_SIZE(imon_mce),
-                /* its actually RC6, but w/a hardware decoder */
-                .ir_type = IR_TYPE_UNKNOWN,
+                /* its RC6, but w/a hardware decoder */
+                .ir_type = IR_TYPE_RC6,
                 .name    = RC_MAP_IMON_MCE,
         }
 };
diff --git a/drivers/media/IR/keymaps/rc-imon-pad.c b/drivers/media/IR/keymaps/rc-imon-pad.c
index 331ba9066b46..bc4db72f02e6 100644
--- a/drivers/media/IR/keymaps/rc-imon-pad.c
+++ b/drivers/media/IR/keymaps/rc-imon-pad.c
@@ -133,7 +133,8 @@ static struct rc_keymap imon_pad_map = {
         .map = {
                 .scan    = imon_pad,
                 .size    = ARRAY_SIZE(imon_pad),
-                .ir_type = IR_TYPE_UNKNOWN,
+                /* actual protocol details unknown, hardware decoder */
+                .ir_type = IR_TYPE_OTHER,
                 .name    = RC_MAP_IMON_PAD,
         }
 };