[media] rc-core: document the protocol type

Right now the protocol information is not preserved, rc-core gets handed a
scancode but has no idea which protocol it corresponds to.

This patch (which required reading through the source/keymap for all drivers,
not fun) makes the protocol information explicit which is important
documentation and makes it easier to e.g. support multiple protocols with one
decoder (think rc5 and rc-streamzap). The information isn't used yet so there
should be no functional changes.

[m.chehab@samsung.com: rebased, added cxusb and removed bad whitespacing]
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

18 files changed, 94 insertions, 44 deletions

diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
index 2df7c5516013..8730b32a067c 100644
--- a/drivers/media/rc/ati_remote.c
+++ b/drivers/media/rc/ati_remote.c
@@ -622,8 +622,8 @@ static void ati_remote_input_report(struct urb *urb)
                                 * it would cause ghost repeats which would be a
                                 * regression for this driver.
                                 */
-                                rc_keydown_notimeout(ati_remote->rdev, scancode,
-                                                     data[2]);
+                                rc_keydown_notimeout(ati_remote->rdev, RC_TYPE_OTHER,
+                                                     scancode, data[2]);
                                 rc_keyup(ati_remote->rdev);
                         }
                         return;
diff --git a/drivers/media/rc/img-ir/img-ir-hw.c b/drivers/media/rc/img-ir/img-ir-hw.c
index 153c0840bf4c..b0ec55f52228 100644
--- a/drivers/media/rc/img-ir/img-ir-hw.c
+++ b/drivers/media/rc/img-ir/img-ir-hw.c
@@ -512,7 +512,7 @@ unlock:
 static int img_ir_set_normal_filter(struct rc_dev *dev,
                                     struct rc_scancode_filter *sc_filter)
 {
-        return img_ir_set_filter(dev, RC_FILTER_NORMAL, sc_filter); 
+        return img_ir_set_filter(dev, RC_FILTER_NORMAL, sc_filter);
 }
 
 static int img_ir_set_wakeup_filter(struct rc_dev *dev,
@@ -795,9 +795,11 @@ static void img_ir_handle_data(struct img_ir_priv *priv, u32 len, u64 raw)
         struct img_ir_priv_hw *hw = &priv->hw;
         const struct img_ir_decoder *dec = hw->decoder;
         int ret = IMG_IR_SCANCODE;
-        int scancode;
+        u32 scancode;
+        enum rc_type protocol = RC_TYPE_UNKNOWN;
+
         if (dec->scancode)
-                ret = dec->scancode(len, raw, &scancode, hw->enabled_protocols);
+                ret = dec->scancode(len, raw, &protocol, &scancode, hw->enabled_protocols);
         else if (len >= 32)
                 scancode = (u32)raw;
         else if (len < 32)
@@ -806,7 +808,7 @@ static void img_ir_handle_data(struct img_ir_priv *priv, u32 len, u64 raw)
                 len, (unsigned long long)raw);
         if (ret == IMG_IR_SCANCODE) {
                 dev_dbg(priv->dev, "decoded scan code %#x\n", scancode);
-                rc_keydown(hw->rdev, scancode, 0);
+                rc_keydown(hw->rdev, protocol, scancode, 0);
                 img_ir_end_repeat(priv);
         } else if (ret == IMG_IR_REPEATCODE) {
                 if (hw->mode == IMG_IR_M_REPEATING) {
diff --git a/drivers/media/rc/img-ir/img-ir-hw.h b/drivers/media/rc/img-ir/img-ir-hw.h
index 450f17dfb66a..3e40ce87b898 100644
--- a/drivers/media/rc/img-ir/img-ir-hw.h
+++ b/drivers/media/rc/img-ir/img-ir-hw.h
@@ -162,7 +162,8 @@ struct img_ir_decoder {
         struct img_ir_control           control;
 
         /* scancode logic */
-        int (*scancode)(int len, u64 raw, int *scancode, u64 protocols);
+        int (*scancode)(int len, u64 raw, enum rc_type *protocol,
+                        u32 *scancode, u64 enabled_protocols);
         int (*filter)(const struct rc_scancode_filter *in,
                       struct img_ir_filter *out, u64 protocols);
 };
diff --git a/drivers/media/rc/img-ir/img-ir-jvc.c b/drivers/media/rc/img-ir/img-ir-jvc.c
index 85ee90f53242..a60dda8bf706 100644
--- a/drivers/media/rc/img-ir/img-ir-jvc.c
+++ b/drivers/media/rc/img-ir/img-ir-jvc.c
@@ -12,7 +12,8 @@
 #include "img-ir-hw.h"
 
 /* Convert JVC data to a scancode */
-static int img_ir_jvc_scancode(int len, u64 raw, int *scancode, u64 protocols)
+static int img_ir_jvc_scancode(int len, u64 raw, enum rc_type *protocol,
+                               u32 *scancode, u64 enabled_protocols)
 {
         unsigned int cust, data;
 
@@ -22,6 +23,7 @@ static int img_ir_jvc_scancode(int len, u64 raw, int *scancode, u64 protocols)
         cust = (raw >> 0) & 0xff;
         data = (raw >> 8) & 0xff;
 
+        *protocol = RC_TYPE_JVC;
         *scancode = cust << 8 | data;
         return IMG_IR_SCANCODE;
 }
diff --git a/drivers/media/rc/img-ir/img-ir-nec.c b/drivers/media/rc/img-ir/img-ir-nec.c
index f7520e25fbdb..739897549b5b 100644
--- a/drivers/media/rc/img-ir/img-ir-nec.c
+++ b/drivers/media/rc/img-ir/img-ir-nec.c
@@ -13,7 +13,8 @@
 #include <linux/bitrev.h>
 
 /* Convert NEC data to a scancode */
-static int img_ir_nec_scancode(int len, u64 raw, int *scancode, u64 protocols)
+static int img_ir_nec_scancode(int len, u64 raw, enum rc_type *protocol,
+                               u32 *scancode, u64 enabled_protocols)
 {
         unsigned int addr, addr_inv, data, data_inv;
         /* a repeat code has no data */
@@ -45,6 +46,7 @@ static int img_ir_nec_scancode(int len, u64 raw, int *scancode, u64 protocols)
                 *scancode = addr << 8 |
                             data;
         }
+        *protocol = RC_TYPE_NEC;
         return IMG_IR_SCANCODE;
 }
 
diff --git a/drivers/media/rc/img-ir/img-ir-sanyo.c b/drivers/media/rc/img-ir/img-ir-sanyo.c
index 6755c945bce8..6b0653ecdf5a 100644
--- a/drivers/media/rc/img-ir/img-ir-sanyo.c
+++ b/drivers/media/rc/img-ir/img-ir-sanyo.c
@@ -23,7 +23,8 @@
 #include "img-ir-hw.h"
 
 /* Convert Sanyo data to a scancode */
-static int img_ir_sanyo_scancode(int len, u64 raw, int *scancode, u64 protocols)
+static int img_ir_sanyo_scancode(int len, u64 raw, enum rc_type *protocol,
+                                 u32 *scancode, u64 enabled_protocols)
 {
         unsigned int addr, addr_inv, data, data_inv;
         /* a repeat code has no data */
@@ -43,6 +44,7 @@ static int img_ir_sanyo_scancode(int len, u64 raw, int *scancode, u64 protocols)
                 return -EINVAL;
 
         /* Normal Sanyo */
+        *protocol = RC_TYPE_SANYO;
         *scancode = addr << 8 | data;
         return IMG_IR_SCANCODE;
 }
diff --git a/drivers/media/rc/img-ir/img-ir-sharp.c b/drivers/media/rc/img-ir/img-ir-sharp.c
index 5867be088cce..3300a38802ac 100644
--- a/drivers/media/rc/img-ir/img-ir-sharp.c
+++ b/drivers/media/rc/img-ir/img-ir-sharp.c
@@ -12,7 +12,8 @@
 #include "img-ir-hw.h"
 
 /* Convert Sharp data to a scancode */
-static int img_ir_sharp_scancode(int len, u64 raw, int *scancode, u64 protocols)
+static int img_ir_sharp_scancode(int len, u64 raw, enum rc_type *protocol,
+                                 u32 *scancode, u64 enabled_protocols)
 {
         unsigned int addr, cmd, exp, chk;
 
@@ -31,6 +32,7 @@ static int img_ir_sharp_scancode(int len, u64 raw, int *scancode, u64 protocols)
                 /* probably the second half of the message */
                 return -EINVAL;
 
+        *protocol = RC_TYPE_SHARP;
         *scancode = addr << 8 | cmd;
         return IMG_IR_SCANCODE;
 }
diff --git a/drivers/media/rc/img-ir/img-ir-sony.c b/drivers/media/rc/img-ir/img-ir-sony.c
index b9029aecceac..3a0f17b0752c 100644
--- a/drivers/media/rc/img-ir/img-ir-sony.c
+++ b/drivers/media/rc/img-ir/img-ir-sony.c
@@ -12,35 +12,39 @@
 #include "img-ir-hw.h"
 
 /* Convert Sony data to a scancode */
-static int img_ir_sony_scancode(int len, u64 raw, int *scancode, u64 protocols)
+static int img_ir_sony_scancode(int len, u64 raw, enum rc_type *protocol,
+                                u32 *scancode, u64 enabled_protocols)
 {
         unsigned int dev, subdev, func;
 
         switch (len) {
         case 12:
-                if (!(protocols & RC_BIT_SONY12))
+                if (!(enabled_protocols & RC_BIT_SONY12))
                         return -EINVAL;
                 func   = raw & 0x7f;    /* first 7 bits */
                 raw    >>= 7;
                 dev    = raw & 0x1f;    /* next 5 bits */
                 subdev = 0;
+                *protocol = RC_TYPE_SONY12;
                 break;
         case 15:
-                if (!(protocols & RC_BIT_SONY15))
+                if (!(enabled_protocols & RC_BIT_SONY15))
                         return -EINVAL;
                 func   = raw & 0x7f;    /* first 7 bits */
                 raw    >>= 7;
                 dev    = raw & 0xff;    /* next 8 bits */
                 subdev = 0;
+                *protocol = RC_TYPE_SONY15;
                 break;
         case 20:
-                if (!(protocols & RC_BIT_SONY20))
+                if (!(enabled_protocols & RC_BIT_SONY20))
                         return -EINVAL;
                 func   = raw & 0x7f;    /* first 7 bits */
                 raw    >>= 7;
                 dev    = raw & 0x1f;    /* next 5 bits */
                 raw    >>= 5;
                 subdev = raw & 0xff;    /* next 8 bits */
+                *protocol = RC_TYPE_SONY20;
                 break;
         default:
                 return -EINVAL;
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 6f24e77b1488..eb37f2622364 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -1579,7 +1579,10 @@ static void imon_incoming_packet(struct imon_context *ictx,
                 if (press_type == 0)
                         rc_keyup(ictx->rdev);
                 else {
-                        rc_keydown(ictx->rdev, ictx->rc_scancode, ictx->rc_toggle);
+                        if (ictx->rc_type == RC_BIT_RC6_MCE)
+                                rc_keydown(ictx->rdev,
+                                           ictx->rc_type == RC_BIT_RC6_MCE ? RC_TYPE_RC6_MCE : RC_TYPE_OTHER,
+                                           ictx->rc_scancode, ictx->rc_toggle);
                         spin_lock_irqsave(&ictx->kc_lock, flags);
                         ictx->last_keycode = ictx->kc;
                         spin_unlock_irqrestore(&ictx->kc_lock, flags);
diff --git a/drivers/media/rc/ir-jvc-decoder.c b/drivers/media/rc/ir-jvc-decoder.c
index 4ea62a1dcfda..7b79eca83449 100644
--- a/drivers/media/rc/ir-jvc-decoder.c
+++ b/drivers/media/rc/ir-jvc-decoder.c
@@ -140,7 +140,7 @@ again:
                         scancode = (bitrev8((data->bits >> 8) & 0xff) << 8) |
                                    (bitrev8((data->bits >> 0) & 0xff) << 0);
                         IR_dprintk(1, "JVC scancode 0x%04x\n", scancode);
-                        rc_keydown(dev, scancode, data->toggle);
+                        rc_keydown(dev, RC_TYPE_JVC, scancode, data->toggle);
                         data->first = false;
                         data->old_bits = data->bits;
                 } else if (data->bits == data->old_bits) {
diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
index 35c42e5e270b..c4333d5c0046 100644
--- a/drivers/media/rc/ir-nec-decoder.c
+++ b/drivers/media/rc/ir-nec-decoder.c
@@ -189,7 +189,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
                 if (data->is_nec_x)
                         data->necx_repeat = true;
 
-                rc_keydown(dev, scancode, 0);
+                rc_keydown(dev, RC_TYPE_NEC, scancode, 0);
                 data->state = STATE_INACTIVE;
                 return 0;
         }
diff --git a/drivers/media/rc/ir-rc5-decoder.c b/drivers/media/rc/ir-rc5-decoder.c
index 4295d9b250c8..3d38cbce5667 100644
--- a/drivers/media/rc/ir-rc5-decoder.c
+++ b/drivers/media/rc/ir-rc5-decoder.c
@@ -51,6 +51,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev)
         struct rc5_dec *data = &dev->raw->rc5;
         u8 toggle;
         u32 scancode;
+        enum rc_type protocol;
 
         if (!rc_protocols_enabled(dev, RC_BIT_RC5 | RC_BIT_RC5X))
                 return 0;
@@ -138,6 +139,7 @@ again:
                         toggle   = (data->bits & 0x20000) ? 1 : 0;
                         command += (data->bits & 0x01000) ? 0 : 0x40;
                         scancode = system << 16 | command << 8 | xdata;
+                        protocol = RC_TYPE_RC5X;
 
                         IR_dprintk(1, "RC5X scancode 0x%06x (toggle: %u)\n",
                                    scancode, toggle);
@@ -154,12 +156,13 @@ again:
                         toggle   = (data->bits & 0x00800) ? 1 : 0;
                         command += (data->bits & 0x01000) ? 0 : 0x40;
                         scancode = system << 8 | command;
+                        protocol = RC_TYPE_RC5;
 
                         IR_dprintk(1, "RC5 scancode 0x%04x (toggle: %u)\n",
                                    scancode, toggle);
                 }
 
-                rc_keydown(dev, scancode, toggle);
+                rc_keydown(dev, protocol, scancode, toggle);
                 data->state = STATE_INACTIVE;
                 return 0;
         }
diff --git a/drivers/media/rc/ir-rc5-sz-decoder.c b/drivers/media/rc/ir-rc5-sz-decoder.c
index dc18b7434db8..85c771112cf5 100644
--- a/drivers/media/rc/ir-rc5-sz-decoder.c
+++ b/drivers/media/rc/ir-rc5-sz-decoder.c
@@ -115,7 +115,7 @@ again:
                 IR_dprintk(1, "RC5-sz scancode 0x%04x (toggle: %u)\n",
                            scancode, toggle);
 
-                rc_keydown(dev, scancode, toggle);
+                rc_keydown(dev, RC_TYPE_RC5_SZ, scancode, toggle);
                 data->state = STATE_INACTIVE;
                 return 0;
         }
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
index cfbd64e3999c..1dc97a7b92a5 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
+++ b/drivers/media/rc/ir-rc6-decoder.c
@@ -88,6 +88,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
         struct rc6_dec *data = &dev->raw->rc6;
         u32 scancode;
         u8 toggle;
+        enum rc_type protocol;
 
         if (!rc_protocols_enabled(dev, RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 |
                                   RC_BIT_RC6_6A_24 | RC_BIT_RC6_6A_32 |
@@ -233,9 +234,11 @@ again:
                 case RC6_MODE_0:
                         scancode = data->body;
                         toggle = data->toggle;
+                        protocol = RC_TYPE_RC6_0;
                         IR_dprintk(1, "RC6(0) scancode 0x%04x (toggle: %u)\n",
                                    scancode, toggle);
                         break;
+
                 case RC6_MODE_6A:
                         if (data->count > CHAR_BIT * sizeof data->body) {
                                 IR_dprintk(1, "RC6 too many (%u) data bits\n",
@@ -244,23 +247,39 @@ again:
                         }
 
                         scancode = data->body;
-                        if (data->count == RC6_6A_32_NBITS &&
-                                        (scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) {
-                                /* MCE RC */
-                                toggle = (scancode & RC6_6A_MCE_TOGGLE_MASK) ? 1 : 0;
-                                scancode &= ~RC6_6A_MCE_TOGGLE_MASK;
-                        } else {
+                        switch (data->count) {
+                        case 20:
+                                protocol = RC_TYPE_RC6_6A_20;
+                                toggle = 0;
+                                break;
+                        case 24:
+                                protocol = RC_BIT_RC6_6A_24;
                                 toggle = 0;
+                                break;
+                        case 32:
+                                if ((scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) {
+                                        protocol = RC_TYPE_RC6_MCE;
+                                        scancode &= ~RC6_6A_MCE_TOGGLE_MASK;
+                                        toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK);
+                                } else {
+                                        protocol = RC_BIT_RC6_6A_32;
+                                        toggle = 0;
+                                }
+                                break;
+                        default:
+                                IR_dprintk(1, "RC6(6A) unsupported length\n");
+                                goto out;
                         }
-                        IR_dprintk(1, "RC6(6A) scancode 0x%08x (toggle: %u)\n",
-                                   scancode, toggle);
+
+                        IR_dprintk(1, "RC6(6A) proto 0x%04x, scancode 0x%08x (toggle: %u)\n",
+                                   protocol, scancode, toggle);
                         break;
                 default:
                         IR_dprintk(1, "RC6 unknown mode\n");
                         goto out;
                 }
 
-                rc_keydown(dev, scancode, toggle);
+                rc_keydown(dev, protocol, scancode, toggle);
                 data->state = STATE_INACTIVE;
                 return 0;
         }
diff --git a/drivers/media/rc/ir-sanyo-decoder.c b/drivers/media/rc/ir-sanyo-decoder.c
index eb715f04dc27..5f7702261d23 100644
--- a/drivers/media/rc/ir-sanyo-decoder.c
+++ b/drivers/media/rc/ir-sanyo-decoder.c
@@ -167,7 +167,7 @@ static int ir_sanyo_decode(struct rc_dev *dev, struct ir_raw_event ev)
 
                 scancode = address << 8 | command;
                 IR_dprintk(1, "SANYO scancode: 0x%06x\n", scancode);
-                rc_keydown(dev, scancode, 0);
+                rc_keydown(dev, RC_TYPE_SANYO, scancode, 0);
                 data->state = STATE_INACTIVE;
                 return 0;
         }
diff --git a/drivers/media/rc/ir-sharp-decoder.c b/drivers/media/rc/ir-sharp-decoder.c
index 66d20394ceaa..c8f251939143 100644
--- a/drivers/media/rc/ir-sharp-decoder.c
+++ b/drivers/media/rc/ir-sharp-decoder.c
@@ -162,7 +162,7 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev)
                 scancode = address << 8 | command;
                 IR_dprintk(1, "Sharp scancode 0x%04x\n", scancode);
 
-                rc_keydown(dev, scancode, 0);
+                rc_keydown(dev, RC_TYPE_SHARP, scancode, 0);
                 data->state = STATE_INACTIVE;
                 return 0;
         }
diff --git a/drivers/media/rc/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c
index 599c19a73360..f485f9fe1e90 100644
--- a/drivers/media/rc/ir-sony-decoder.c
+++ b/drivers/media/rc/ir-sony-decoder.c
@@ -42,6 +42,7 @@ enum sony_state {
 static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
 {
         struct sony_dec *data = &dev->raw->sony;
+        enum rc_type protocol;
         u32 scancode;
         u8 device, subdevice, function;
 
@@ -131,6 +132,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
                         device    = bitrev8((data->bits <<  3) & 0xF8);
                         subdevice = 0;
                         function  = bitrev8((data->bits >>  4) & 0xFE);
+                        protocol = RC_TYPE_SONY12;
                         break;
                 case 15:
                         if (!rc_protocols_enabled(dev, RC_BIT_SONY15)) {
@@ -140,6 +142,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
                         device    = bitrev8((data->bits >>  0) & 0xFF);
                         subdevice = 0;
                         function  = bitrev8((data->bits >>  7) & 0xFE);
+                        protocol = RC_TYPE_SONY15;
                         break;
                 case 20:
                         if (!rc_protocols_enabled(dev, RC_BIT_SONY20)) {
@@ -149,6 +152,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
                         device    = bitrev8((data->bits >>  5) & 0xF8);
                         subdevice = bitrev8((data->bits >>  0) & 0xFF);
                         function  = bitrev8((data->bits >> 12) & 0xFE);
+                        protocol = RC_TYPE_SONY20;
                         break;
                 default:
                         IR_dprintk(1, "Sony invalid bitcount %u\n", data->count);
@@ -157,7 +161,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
 
                 scancode = device << 16 | subdevice << 8 | function;
                 IR_dprintk(1, "Sony(%u) scancode 0x%05x\n", data->count, scancode);
-                rc_keydown(dev, scancode, 0);
+                rc_keydown(dev, protocol, scancode, 0);
                 data->state = STATE_INACTIVE;
                 return 0;
         }
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 970b93d6f399..9abcf77246fa 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -623,6 +623,7 @@ EXPORT_SYMBOL_GPL(rc_repeat);
 /**
  * ir_do_keydown() - internal function to process a keypress
  * @dev:        the struct rc_dev descriptor of the device
+ * @protocol:   the protocol of the keypress
  * @scancode:   the scancode of the keypress
  * @keycode:    the keycode of the keypress
  * @toggle:     the toggle value of the keypress
@@ -630,12 +631,13 @@ EXPORT_SYMBOL_GPL(rc_repeat);
  * This function is used internally to register a keypress, it must be
  * called with keylock held.
  */
-static void ir_do_keydown(struct rc_dev *dev, int scancode,
-                          u32 keycode, u8 toggle)
+static void ir_do_keydown(struct rc_dev *dev, enum rc_type protocol,
+                          u32 scancode, u32 keycode, u8 toggle)
 {
         bool new_event = (!dev->keypressed               ||
+                          dev->last_protocol != protocol ||
                           dev->last_scancode != scancode ||
-                          dev->last_toggle != toggle);
+                          dev->last_toggle   != toggle);
 
         if (new_event && dev->keypressed)
                 ir_do_keyup(dev, false);
@@ -645,13 +647,14 @@ static void ir_do_keydown(struct rc_dev *dev, int scancode,
         if (new_event && keycode != KEY_RESERVED) {
                 /* Register a keypress */
                 dev->keypressed = true;
+                dev->last_protocol = protocol;
                 dev->last_scancode = scancode;
                 dev->last_toggle = toggle;
                 dev->last_keycode = keycode;
 
                 IR_dprintk(1, "%s: key down event, "
-                           "key 0x%04x, scancode 0x%04x\n",
-                           dev->input_name, keycode, scancode);
+                           "key 0x%04x, protocol 0x%04x, scancode 0x%08x\n",
+                           dev->input_name, keycode, protocol, scancode);
                 input_report_key(dev->input_dev, keycode, 1);
 
                 led_trigger_event(led_feedback, LED_FULL);
@@ -663,20 +666,21 @@ static void ir_do_keydown(struct rc_dev *dev, int scancode,
 /**
  * rc_keydown() - generates input event for a key press
  * @dev:        the struct rc_dev descriptor of the device
- * @scancode:   the scancode that we're seeking
+ * @protocol:   the protocol for the keypress
+ * @scancode:   the scancode for the keypress
  * @toggle:     the toggle value (protocol dependent, if the protocol doesn't
  *              support toggle values, this should be set to zero)
  *
  * This routine is used to signal that a key has been pressed on the
  * remote control.
  */
-void rc_keydown(struct rc_dev *dev, int scancode, u8 toggle)
+void rc_keydown(struct rc_dev *dev, enum rc_type protocol, u32 scancode, u8 toggle)
 {
         unsigned long flags;
         u32 keycode = rc_g_keycode_from_table(dev, scancode);
 
         spin_lock_irqsave(&dev->keylock, flags);
-        ir_do_keydown(dev, scancode, keycode, toggle);
+        ir_do_keydown(dev, protocol, scancode, keycode, toggle);
 
         if (dev->keypressed) {
                 dev->keyup_jiffies = jiffies + msecs_to_jiffies(IR_KEYPRESS_TIMEOUT);
@@ -690,20 +694,22 @@ EXPORT_SYMBOL_GPL(rc_keydown);
  * rc_keydown_notimeout() - generates input event for a key press without
  *                          an automatic keyup event at a later time
  * @dev:        the struct rc_dev descriptor of the device
- * @scancode:   the scancode that we're seeking
+ * @protocol:   the protocol for the keypress
+ * @scancode:   the scancode for the keypress
  * @toggle:     the toggle value (protocol dependent, if the protocol doesn't
  *              support toggle values, this should be set to zero)
  *
  * This routine is used to signal that a key has been pressed on the
  * remote control. The driver must manually call rc_keyup() at a later stage.
  */
-void rc_keydown_notimeout(struct rc_dev *dev, int scancode, u8 toggle)
+void rc_keydown_notimeout(struct rc_dev *dev, enum rc_type protocol,
+                          u32 scancode, u8 toggle)
 {
         unsigned long flags;
         u32 keycode = rc_g_keycode_from_table(dev, scancode);
 
         spin_lock_irqsave(&dev->keylock, flags);
-        ir_do_keydown(dev, scancode, keycode, toggle);
+        ir_do_keydown(dev, protocol, scancode, keycode, toggle);
         spin_unlock_irqrestore(&dev->keylock, flags);
 }
 EXPORT_SYMBOL_GPL(rc_keydown_notimeout);
@@ -1315,7 +1321,7 @@ int rc_register_device(struct rc_dev *dev)
         dev->dev.groups = dev->sysfs_groups;
         dev->sysfs_groups[attr++] = &rc_dev_protocol_attr_grp;
         if (dev->s_filter)
-                dev->sysfs_groups[attr++] = &rc_dev_filter_attr_grp;    
+                dev->sysfs_groups[attr++] = &rc_dev_filter_attr_grp;
         if (dev->s_wakeup_filter)
                 dev->sysfs_groups[attr++] = &rc_dev_wakeup_filter_attr_grp;
         if (dev->change_wakeup_protocol)