[media] rc-core: improve ir-kbd-i2c get_key functions

The arguments used for ir-kbd-i2c's get_key() functions are not
really suited for rc-core and the ir_raw/ir_key distinction is
just confusing.

Convert all of them to return a protocol/scancode/toggle triple instead.

Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

2 files changed, 14 insertions, 2 deletions

diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index e221bc74020b..d8564354debb 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -20,7 +20,8 @@ struct IR_i2c {
         struct delayed_work    work;
         char                   name[32];
         char                   phys[32];
-        int                    (*get_key)(struct IR_i2c*, u32*, u32*);
+        int                    (*get_key)(struct IR_i2c *ir, enum rc_type *protocol,
+                                          u32 *scancode, u8 *toggle);
 };
 
 enum ir_kbd_get_key_fn {
@@ -44,7 +45,8 @@ struct IR_i2c_init_data {
          * Specify either a function pointer or a value indicating one of
          * ir_kbd_i2c's internal get_key functions
          */
-        int                    (*get_key)(struct IR_i2c*, u32*, u32*);
+        int                    (*get_key)(struct IR_i2c *ir, enum rc_type *protocol,
+                                          u32 *scancode, u8 *toggle);
         enum ir_kbd_get_key_fn internal_get_key_func;
 
         struct rc_dev           *rc_dev;
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index e5aa2409c0ea..894c7e4c409b 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -62,6 +62,16 @@ enum rc_type {
                          RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | RC_BIT_RC6_6A_24 | \
                          RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE | RC_BIT_SHARP)
 
+#define RC_SCANCODE_UNKNOWN(x)                  (x)
+#define RC_SCANCODE_OTHER(x)                    (x)
+#define RC_SCANCODE_NEC(addr, cmd)              (((addr) << 8) | (cmd))
+#define RC_SCANCODE_NECX(addr, cmd)             (((addr) << 8) | (cmd))
+#define RC_SCANCODE_NEC32(data)                 ((data) & 0xffffffff)
+#define RC_SCANCODE_RC5(sys, cmd)               (((sys) << 8) | (cmd))
+#define RC_SCANCODE_RC5_SZ(sys, cmd)            (((sys) << 8) | (cmd))
+#define RC_SCANCODE_RC6_0(sys, cmd)             (((sys) << 8) | (cmd))
+#define RC_SCANCODE_RC6_6A(vendor, sys, cmd)    (((vendor) << 16) | ((sys) << 8) | (cmd))
+
 struct rc_map_table {
         u32     scancode;
         u32     keycode;