[media] lmedm04: NEC scancode cleanup

This changes the keymap back to the state before commit 616a4b83
and changes the driver to use full NEC32 scancodes following the
instructions provided by Malcolm Priestley <tvboxspy@gmail.com>.

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

diff --git a/drivers/media/rc/keymaps/rc-lme2510.c b/drivers/media/rc/keymaps/rc-lme2510.c
index 51f18bb50a371b79ffea87850724d900eab48d6f..2b0027c413326fb731dc3b95b1ff7a3cadedad64 100644 (file)
--- a/drivers/media/rc/keymaps/rc-lme2510.c
+++ b/drivers/media/rc/keymaps/rc-lme2510.c
@@ -15,74 +15,74 @@
 
 static struct rc_map_table lme2510_rc[] = {
        /* Type 1 - 26 buttons */
-       { 0x10ed45, KEY_0 },
-       { 0x10ed5f, KEY_1 },
-       { 0x10ed50, KEY_2 },
-       { 0x10ed5d, KEY_3 },
-       { 0x10ed41, KEY_4 },
-       { 0x10ed0a, KEY_5 },
-       { 0x10ed42, KEY_6 },
-       { 0x10ed47, KEY_7 },
-       { 0x10ed49, KEY_8 },
-       { 0x10ed05, KEY_9 },
-       { 0x10ed43, KEY_POWER },
-       { 0x10ed46, KEY_SUBTITLE },
-       { 0x10ed06, KEY_PAUSE },
-       { 0x10ed03, KEY_MEDIA_REPEAT},
-       { 0x10ed02, KEY_PAUSE },
-       { 0x10ed5e, KEY_VOLUMEUP },
-       { 0x10ed5c, KEY_VOLUMEDOWN },
-       { 0x10ed09, KEY_CHANNELUP },
-       { 0x10ed1a, KEY_CHANNELDOWN },
-       { 0x10ed1e, KEY_PLAY },
-       { 0x10ed1b, KEY_ZOOM },
-       { 0x10ed59, KEY_MUTE },
-       { 0x10ed5a, KEY_TV },
-       { 0x10ed18, KEY_RECORD },
-       { 0x10ed07, KEY_EPG },
-       { 0x10ed01, KEY_STOP },
+       { 0xef12ba45, KEY_0 },
+       { 0xef12a05f, KEY_1 },
+       { 0xef12af50, KEY_2 },
+       { 0xef12a25d, KEY_3 },
+       { 0xef12be41, KEY_4 },
+       { 0xef12f50a, KEY_5 },
+       { 0xef12bd42, KEY_6 },
+       { 0xef12b847, KEY_7 },
+       { 0xef12b649, KEY_8 },
+       { 0xef12fa05, KEY_9 },
+       { 0xef12bc43, KEY_POWER },
+       { 0xef12b946, KEY_SUBTITLE },
+       { 0xef12f906, KEY_PAUSE },
+       { 0xef12fc03, KEY_MEDIA_REPEAT},
+       { 0xef12fd02, KEY_PAUSE },
+       { 0xef12a15e, KEY_VOLUMEUP },
+       { 0xef12a35c, KEY_VOLUMEDOWN },
+       { 0xef12f609, KEY_CHANNELUP },
+       { 0xef12e51a, KEY_CHANNELDOWN },
+       { 0xef12e11e, KEY_PLAY },
+       { 0xef12e41b, KEY_ZOOM },
+       { 0xef12a659, KEY_MUTE },
+       { 0xef12a55a, KEY_TV },
+       { 0xef12e718, KEY_RECORD },
+       { 0xef12f807, KEY_EPG },
+       { 0xef12fe01, KEY_STOP },
        /* Type 2 - 20 buttons */
-       { 0xbf15, KEY_0 },
-       { 0xbf08, KEY_1 },
-       { 0xbf09, KEY_2 },
-       { 0xbf0a, KEY_3 },
-       { 0xbf0c, KEY_4 },
-       { 0xbf0d, KEY_5 },
-       { 0xbf0e, KEY_6 },
-       { 0xbf10, KEY_7 },
-       { 0xbf11, KEY_8 },
-       { 0xbf12, KEY_9 },
-       { 0xbf00, KEY_POWER },
-       { 0xbf04, KEY_MEDIA_REPEAT}, /* Recall */
-       { 0xbf1a, KEY_PAUSE }, /* Timeshift */
-       { 0xbf02, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
-       { 0xbf06, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/
-       { 0xbf01, KEY_CHANNELUP },
-       { 0xbf05, KEY_CHANNELDOWN },
-       { 0xbf14, KEY_ZOOM },
-       { 0xbf18, KEY_RECORD },
-       { 0xbf16, KEY_STOP },
+       { 0xff40ea15, KEY_0 },
+       { 0xff40f708, KEY_1 },
+       { 0xff40f609, KEY_2 },
+       { 0xff40f50a, KEY_3 },
+       { 0xff40f30c, KEY_4 },
+       { 0xff40f20d, KEY_5 },
+       { 0xff40f10e, KEY_6 },
+       { 0xff40ef10, KEY_7 },
+       { 0xff40ee11, KEY_8 },
+       { 0xff40ed12, KEY_9 },
+       { 0xff40ff00, KEY_POWER },
+       { 0xff40fb04, KEY_MEDIA_REPEAT}, /* Recall */
+       { 0xff40e51a, KEY_PAUSE }, /* Timeshift */
+       { 0xff40fd02, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
+       { 0xff40f906, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/
+       { 0xff40fe01, KEY_CHANNELUP },
+       { 0xff40fa05, KEY_CHANNELDOWN },
+       { 0xff40eb14, KEY_ZOOM },
+       { 0xff40e718, KEY_RECORD },
+       { 0xff40e916, KEY_STOP },
        /* Type 3 - 20 buttons */
-       { 0x1c, KEY_0 },
-       { 0x07, KEY_1 },
-       { 0x15, KEY_2 },
-       { 0x09, KEY_3 },
-       { 0x16, KEY_4 },
-       { 0x19, KEY_5 },
-       { 0x0d, KEY_6 },
-       { 0x0c, KEY_7 },
-       { 0x18, KEY_8 },
-       { 0x5e, KEY_9 },
-       { 0x45, KEY_POWER },
-       { 0x44, KEY_MEDIA_REPEAT}, /* Recall */
-       { 0x4a, KEY_PAUSE }, /* Timeshift */
-       { 0x47, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
-       { 0x43, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/
-       { 0x46, KEY_CHANNELUP },
-       { 0x40, KEY_CHANNELDOWN },
-       { 0x08, KEY_ZOOM },
-       { 0x42, KEY_RECORD },
-       { 0x5a, KEY_STOP },
+       { 0xff00e31c, KEY_0 },
+       { 0xff00f807, KEY_1 },
+       { 0xff00ea15, KEY_2 },
+       { 0xff00f609, KEY_3 },
+       { 0xff00e916, KEY_4 },
+       { 0xff00e619, KEY_5 },
+       { 0xff00f20d, KEY_6 },
+       { 0xff00f30c, KEY_7 },
+       { 0xff00e718, KEY_8 },
+       { 0xff00a15e, KEY_9 },
+       { 0xff00ba45, KEY_POWER },
+       { 0xff00bb44, KEY_MEDIA_REPEAT}, /* Recall */
+       { 0xff00b54a, KEY_PAUSE }, /* Timeshift */
+       { 0xff00b847, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
+       { 0xff00bc43, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/
+       { 0xff00b946, KEY_CHANNELUP },
+       { 0xff00bf40, KEY_CHANNELDOWN },
+       { 0xff00f708, KEY_ZOOM },
+       { 0xff00bd42, KEY_RECORD },
+       { 0xff00a55a, KEY_STOP },
 };
 
 static struct rc_map_list lme2510_map = {

diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c
index 4cc55b3a0558f2d1f4739693ef56e7e15ad4ab19..3721ee63b8fb0acdc3da50a70813ce80f1174154 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/lmedm04.c
+++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c
@@ -348,15 +348,16 @@ static void lme2510_int_response(struct urb *lme_urb)
                switch (ibuf[0]) {
                case 0xaa:
                        debug_data_snipet(1, "INT Remote data snipet", ibuf);
-                       if ((ibuf[4] + ibuf[5]) == 0xff) {
-                               key = RC_SCANCODE_NECX((ibuf[2] ^ 0xff) << 8 |
-                                                      (ibuf[3] > 0) ? (ibuf[3] ^ 0xff) : 0,
-                                                      ibuf[5]);
-                               deb_info(1, "INT Key =%08x", key);
-                               if (adap_to_d(adap)->rc_dev != NULL)
-                                       rc_keydown(adap_to_d(adap)->rc_dev,
-                                                  RC_TYPE_NEC, key, 0);
-                       }
+                       if (!adap_to_d(adap)->rc_dev)
+                               break;
+
+                       key = RC_SCANCODE_NEC32(ibuf[2] << 24 |
+                                               ibuf[3] << 16 |
+                                               ibuf[4] << 8  |
+                                               ibuf[5]);
+
+                       deb_info(1, "INT Key = 0x%08x", key);
+                       rc_keydown(adap_to_d(adap)->rc_dev, RC_TYPE_NEC, key, 0);
                        break;
                case 0xbb:
                        switch (st->tuner_config) {
@@ -1344,7 +1345,7 @@ module_usb_driver(lme2510_driver);
 
 MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
 MODULE_DESCRIPTION("LME2510(C) DVB-S USB2.0");
-MODULE_VERSION("2.06");
+MODULE_VERSION("2.07");
 MODULE_LICENSE("GPL");
 MODULE_FIRMWARE(LME2510_C_S7395);
 MODULE_FIRMWARE(LME2510_C_LG);