1 files changed, 69 insertions, 27 deletions
diff --git a/drivers/media/rc/keymaps/rc-lme2510.c b/drivers/media/rc/keymaps/rc-lme2510.c
index 875cd81477c7..3c1913926c1a 100644
--- a/drivers/media/rc/keymaps/rc-lme2510.c
+++ b/drivers/media/rc/keymaps/rc-lme2510.c
@@ -13,33 +13,75 @@
 static struct rc_map_table lme2510_rc[] = {
-        { 0xba45, KEY_0 },
+        /* Type 1 - 26 buttons */
-        { 0xa05f, KEY_1 },
+        { 0xef12ba45, KEY_0 },
-        { 0xaf50, KEY_2 },
+        { 0xef12a05f, KEY_1 },
-        { 0xa25d, KEY_3 },
+        { 0xef12af50, KEY_2 },
-        { 0xbe41, KEY_4 },
+        { 0xef12a25d, KEY_3 },
-        { 0xf50a, KEY_5 },
+        { 0xef12be41, KEY_4 },
-        { 0xbd42, KEY_6 },
+        { 0xef12f50a, KEY_5 },
-        { 0xb847, KEY_7 },
+        { 0xef12bd42, KEY_6 },
-        { 0xb649, KEY_8 },
+        { 0xef12b847, KEY_7 },
-        { 0xfa05, KEY_9 },
+        { 0xef12b649, KEY_8 },
-        { 0xbc43, KEY_POWER },
+        { 0xef12fa05, KEY_9 },
-        { 0xb946, KEY_SUBTITLE },
+        { 0xef12bc43, KEY_POWER },
-        { 0xf906, KEY_PAUSE },
+        { 0xef12b946, KEY_SUBTITLE },
-        { 0xfc03, KEY_MEDIA_REPEAT},
+        { 0xef12f906, KEY_PAUSE },
-        { 0xfd02, KEY_PAUSE },
+        { 0xef12fc03, KEY_MEDIA_REPEAT},
-        { 0xa15e, KEY_VOLUMEUP },
+        { 0xef12fd02, KEY_PAUSE },
-        { 0xa35c, KEY_VOLUMEDOWN },
+        { 0xef12a15e, KEY_VOLUMEUP },
-        { 0xf609, KEY_CHANNELUP },
+        { 0xef12a35c, KEY_VOLUMEDOWN },
-        { 0xe51a, KEY_CHANNELDOWN },
+        { 0xef12f609, KEY_CHANNELUP },
-        { 0xe11e, KEY_PLAY },
+        { 0xef12e51a, KEY_CHANNELDOWN },
-        { 0xe41b, KEY_ZOOM },
+        { 0xef12e11e, KEY_PLAY },
-        { 0xa659, KEY_MUTE },
+        { 0xef12e41b, KEY_ZOOM },
-        { 0xa55a, KEY_TV },
+        { 0xef12a659, KEY_MUTE },
-        { 0xe718, KEY_RECORD },
+        { 0xef12a55a, KEY_TV },
-        { 0xf807, KEY_EPG },
+        { 0xef12e718, KEY_RECORD },
-        { 0xfe01, KEY_STOP },
+        { 0xef12f807, KEY_EPG },
+        { 0xef12fe01, KEY_STOP },
+        /* Type 2 - 20 buttons */
+        { 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 }, /* Volumne defined as right hand*/
+        { 0xff40fe01, KEY_CHANNELUP },
+        { 0xff40fa05, KEY_CHANNELDOWN },
+        { 0xff40eb14, KEY_ZOOM },
+        { 0xff40e718, KEY_RECORD },
+        { 0xff40e916, KEY_STOP },
+        /* Type 3 - 20 buttons */
+        { 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 }, /* Volumne 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/rc/keymaps/rc-lme2510.c b/drivers/media/rc/keymaps/rc-lme2510.c index 875cd81477c7..3c1913926c1a 100644 --- a/drivers/media/rc/keymaps/rc-lme2510.c +++ b/drivers/media/rc/keymaps/rc-lme2510.c
@@ -13,33 +13,75 @@
13		13
14		14
15	static struct rc_map_table lme2510_rc[] = {	15	static struct rc_map_table lme2510_rc[] = {
16	{ 0xba45, KEY_0 },	16	/* Type 1 - 26 buttons */
17	{ 0xa05f, KEY_1 },	17	{ 0xef12ba45, KEY_0 },
18	{ 0xaf50, KEY_2 },	18	{ 0xef12a05f, KEY_1 },
19	{ 0xa25d, KEY_3 },	19	{ 0xef12af50, KEY_2 },
20	{ 0xbe41, KEY_4 },	20	{ 0xef12a25d, KEY_3 },
21	{ 0xf50a, KEY_5 },	21	{ 0xef12be41, KEY_4 },
22	{ 0xbd42, KEY_6 },	22	{ 0xef12f50a, KEY_5 },
23	{ 0xb847, KEY_7 },	23	{ 0xef12bd42, KEY_6 },
24	{ 0xb649, KEY_8 },	24	{ 0xef12b847, KEY_7 },
25	{ 0xfa05, KEY_9 },	25	{ 0xef12b649, KEY_8 },
26	{ 0xbc43, KEY_POWER },	26	{ 0xef12fa05, KEY_9 },
27	{ 0xb946, KEY_SUBTITLE },	27	{ 0xef12bc43, KEY_POWER },
28	{ 0xf906, KEY_PAUSE },	28	{ 0xef12b946, KEY_SUBTITLE },
29	{ 0xfc03, KEY_MEDIA_REPEAT},	29	{ 0xef12f906, KEY_PAUSE },
30	{ 0xfd02, KEY_PAUSE },	30	{ 0xef12fc03, KEY_MEDIA_REPEAT},
31	{ 0xa15e, KEY_VOLUMEUP },	31	{ 0xef12fd02, KEY_PAUSE },
32	{ 0xa35c, KEY_VOLUMEDOWN },	32	{ 0xef12a15e, KEY_VOLUMEUP },
33	{ 0xf609, KEY_CHANNELUP },	33	{ 0xef12a35c, KEY_VOLUMEDOWN },
34	{ 0xe51a, KEY_CHANNELDOWN },	34	{ 0xef12f609, KEY_CHANNELUP },
35	{ 0xe11e, KEY_PLAY },	35	{ 0xef12e51a, KEY_CHANNELDOWN },
36	{ 0xe41b, KEY_ZOOM },	36	{ 0xef12e11e, KEY_PLAY },
37	{ 0xa659, KEY_MUTE },	37	{ 0xef12e41b, KEY_ZOOM },
38	{ 0xa55a, KEY_TV },	38	{ 0xef12a659, KEY_MUTE },
39	{ 0xe718, KEY_RECORD },	39	{ 0xef12a55a, KEY_TV },
40	{ 0xf807, KEY_EPG },	40	{ 0xef12e718, KEY_RECORD },
41	{ 0xfe01, KEY_STOP },	41	{ 0xef12f807, KEY_EPG },
42		42	{ 0xef12fe01, KEY_STOP },
		43	/* Type 2 - 20 buttons */
		44	{ 0xff40ea15, KEY_0 },
		45	{ 0xff40f708, KEY_1 },
		46	{ 0xff40f609, KEY_2 },
		47	{ 0xff40f50a, KEY_3 },
		48	{ 0xff40f30c, KEY_4 },
		49	{ 0xff40f20d, KEY_5 },
		50	{ 0xff40f10e, KEY_6 },
		51	{ 0xff40ef10, KEY_7 },
		52	{ 0xff40ee11, KEY_8 },
		53	{ 0xff40ed12, KEY_9 },
		54	{ 0xff40ff00, KEY_POWER },
		55	{ 0xff40fb04, KEY_MEDIA_REPEAT}, /* Recall */
		56	{ 0xff40e51a, KEY_PAUSE }, /* Timeshift */
		57	{ 0xff40fd02, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
		58	{ 0xff40f906, KEY_VOLUMEDOWN }, /* Volumne defined as right hand*/
		59	{ 0xff40fe01, KEY_CHANNELUP },
		60	{ 0xff40fa05, KEY_CHANNELDOWN },
		61	{ 0xff40eb14, KEY_ZOOM },
		62	{ 0xff40e718, KEY_RECORD },
		63	{ 0xff40e916, KEY_STOP },
		64	/* Type 3 - 20 buttons */
		65	{ 0xff00e31c, KEY_0 },
		66	{ 0xff00f807, KEY_1 },
		67	{ 0xff00ea15, KEY_2 },
		68	{ 0xff00f609, KEY_3 },
		69	{ 0xff00e916, KEY_4 },
		70	{ 0xff00e619, KEY_5 },
		71	{ 0xff00f20d, KEY_6 },
		72	{ 0xff00f30c, KEY_7 },
		73	{ 0xff00e718, KEY_8 },
		74	{ 0xff00a15e, KEY_9 },
		75	{ 0xff00ba45, KEY_POWER },
		76	{ 0xff00bb44, KEY_MEDIA_REPEAT}, /* Recall */
		77	{ 0xff00b54a, KEY_PAUSE }, /* Timeshift */
		78	{ 0xff00b847, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
		79	{ 0xff00bc43, KEY_VOLUMEDOWN }, /* Volumne defined as right hand*/
		80	{ 0xff00b946, KEY_CHANNELUP },
		81	{ 0xff00bf40, KEY_CHANNELDOWN },
		82	{ 0xff00f708, KEY_ZOOM },
		83	{ 0xff00bd42, KEY_RECORD },
		84	{ 0xff00a55a, KEY_STOP },
43	};	85	};
44		86
45	static struct rc_map_list lme2510_map = {	87	static struct rc_map_list lme2510_map = {