[media] rc/keymaps: Rename Hauppauge table as rc-hauppauge

There are two "hauppauge-new" keymaps, one with protocol unknown, and the other with the protocol marked accordingly. However, both tables are miss-named. Also, the old rc-hauppauge-new is broken, as it mixes three different controllers as if they were just one. This patch solves half of the problem by renaming the correct keycode table as just rc-hauppauge. This table contains the codes for the four different types of remote controllers found on Hauppauge cards, properly mapped with their different addresses. create mode 100644 drivers/media/rc/keymaps/rc-hauppauge.c delete mode 100644 drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c [Jarod: fix up RC_MAP_HAUPPAUGE defines] Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Jarod Wilson <jarod@redhat.com>

[media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
There are two "hauppauge-new" keymaps, one with protocol unknown, and the other with the protocol marked accordingly. However, both tables are miss-named. Also, the old rc-hauppauge-new is broken, as it mixes three different controllers as if they were just one. This patch solves half of the problem by renaming the correct keycode table as just rc-hauppauge. This table contains the codes for the four different types of remote controllers found on Hauppauge cards, properly mapped with their different addresses. create mode 100644 drivers/media/rc/keymaps/rc-hauppauge.c delete mode 100644 drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c [Jarod: fix up RC_MAP_HAUPPAUGE defines] Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Jarod Wilson <jarod@redhat.com>
Mauro Carvalho Chehab
1 parent 0548757419
Showing 8 changed files with 249 additions and 243 deletions Side-by-side Diff
drivers/media/dvb/siano/sms-cards.c
drivers/media/rc/keymaps/Makefile
drivers/media/rc/keymaps/rc-hauppauge.c
drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
drivers/media/rc/mceusb.c
drivers/media/video/cx23885/cx23885-input.c
drivers/media/video/em28xx/em28xx-cards.c
include/media/rc-map.h
@@ -64,7 +64,7 @@
 		.type	= SMS_NOVA_B0,
 		.fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw",
 		.fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
-		.rc_codes = RC_MAP_RC5_HAUPPAUGE_NEW,
+		.rc_codes = RC_MAP_HAUPPAUGE,
 		.board_cfg.leds_power = 26,
 		.board_cfg.led0 = 27,
 		.board_cfg.led1 = 28,
@@ -68,7 +68,7 @@
 			rc-proteus-2309.o \
 			rc-purpletv.o \
 			rc-pv951.o \
-			rc-rc5-hauppauge-new.o \
+			rc-hauppauge.o \
 			rc-rc5-tv.o \
 			rc-rc6-mce.o \
 			rc-real-audio-220-32-keys.o \
+/* rc-hauppauge.c - Keytable for Hauppauge Remote Controllers
+ *
+ * keymap imported from ir-keymaps.c
+ *
+ * This map currently contains the code for four different RCs:
+ *	- New Hauppauge Gray;
+ *	- Old Hauppauge Gray (with a golden screen for media keys);
+ *	- Hauppauge Black;
+ *	- DSR-0112 remote bundled with Haupauge MiniStick.
+ *
+ * Copyright (c) 2010-2011 by Mauro Carvalho Chehab <mchehab@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <media/rc-map.h>
+
+/*
+ * Hauppauge:the newer, gray remotes (seems there are multiple
+ * slightly different versions), shipped with cx88+ivtv cards.
+ *
+ * This table contains the complete RC5 code, instead of just the data part
+ */
+
+static struct rc_map_table rc5_hauppauge_new[] = {
+	/*
+	 * Remote Controller Hauppauge Gray found on modern devices
+	 * Keycodes start with address = 0x1e
+	 */
+
+	{ 0x1e3b, KEY_SELECT },		/* GO / house symbol */
+	{ 0x1e3d, KEY_POWER2 },		/* system power (green button) */
+
+	{ 0x1e1c, KEY_TV },
+	{ 0x1e18, KEY_VIDEO },		/* Videos */
+	{ 0x1e19, KEY_AUDIO },		/* Music */
+	{ 0x1e1a, KEY_CAMERA },		/* Pictures */
+
+	{ 0x1e1b, KEY_EPG },		/* Guide */
+	{ 0x1e0c, KEY_RADIO },
+
+	{ 0x1e14, KEY_UP },
+	{ 0x1e15, KEY_DOWN },
+	{ 0x1e16, KEY_LEFT },
+	{ 0x1e17, KEY_RIGHT },
+	{ 0x1e25, KEY_OK },		/* OK */
+
+	{ 0x1e1f, KEY_EXIT },		/* back/exit */
+	{ 0x1e0d, KEY_MENU },
+
+	{ 0x1e10, KEY_VOLUMEUP },
+	{ 0x1e11, KEY_VOLUMEDOWN },
+
+	{ 0x1e12, KEY_PREVIOUS },	/* previous channel */
+	{ 0x1e0f, KEY_MUTE },
+
+	{ 0x1e20, KEY_CHANNELUP },	/* channel / program + */
+	{ 0x1e21, KEY_CHANNELDOWN },	/* channel / program - */
+
+	{ 0x1e37, KEY_RECORD },		/* recording */
+	{ 0x1e36, KEY_STOP },
+
+	{ 0x1e32, KEY_REWIND },		/* backward << */
+	{ 0x1e35, KEY_PLAY },
+	{ 0x1e34, KEY_FASTFORWARD },	/* forward >> */
+
+	{ 0x1e24, KEY_PREVIOUSSONG },	/* replay |< */
+	{ 0x1e30, KEY_PAUSE },		/* pause */
+	{ 0x1e1e, KEY_NEXTSONG },	/* skip >| */
+
+	{ 0x1e01, KEY_1 },
+	{ 0x1e02, KEY_2 },
+	{ 0x1e03, KEY_3 },
+
+	{ 0x1e04, KEY_4 },
+	{ 0x1e05, KEY_5 },
+	{ 0x1e06, KEY_6 },
+
+	{ 0x1e07, KEY_7 },
+	{ 0x1e08, KEY_8 },
+	{ 0x1e09, KEY_9 },
+
+	{ 0x1e0a, KEY_TEXT },		/* keypad asterisk as well */
+	{ 0x1e00, KEY_0 },
+	{ 0x1e0e, KEY_SUBTITLE },	/* also the Pound key (#) */
+
+	{ 0x1e0b, KEY_RED },		/* red button */
+	{ 0x1e2e, KEY_GREEN },		/* green button */
+	{ 0x1e38, KEY_YELLOW },		/* yellow key */
+	{ 0x1e29, KEY_BLUE },		/* blue key */
+
+	/*
+	 * Old Remote Controller Hauppauge Gray with a golden screen
+	 * Keycodes start with address = 0x1f
+	 */
+	{ 0x1f3d, KEY_POWER2 },		/* system power (green button) */
+	{ 0x1f3b, KEY_SELECT },		/* GO */
+
+	/* Keys 0 to 9 */
+	{ 0x1f00, KEY_0 },
+	{ 0x1f01, KEY_1 },
+	{ 0x1f02, KEY_2 },
+	{ 0x1f03, KEY_3 },
+	{ 0x1f04, KEY_4 },
+	{ 0x1f05, KEY_5 },
+	{ 0x1f06, KEY_6 },
+	{ 0x1f07, KEY_7 },
+	{ 0x1f08, KEY_8 },
+	{ 0x1f09, KEY_9 },
+
+	{ 0x1f1f, KEY_EXIT },		/* back/exit */
+	{ 0x1f0d, KEY_MENU },
+
+	{ 0x1f10, KEY_VOLUMEUP },
+	{ 0x1f11, KEY_VOLUMEDOWN },
+	{ 0x1f20, KEY_CHANNELUP },	/* channel / program + */
+	{ 0x1f21, KEY_CHANNELDOWN },	/* channel / program - */
+	{ 0x1f25, KEY_ENTER },		/* OK */
+
+	{ 0x1f0b, KEY_RED },		/* red button */
+	{ 0x1f2e, KEY_GREEN },		/* green button */
+	{ 0x1f38, KEY_YELLOW },		/* yellow key */
+	{ 0x1f29, KEY_BLUE },		/* blue key */
+
+	{ 0x1f0f, KEY_MUTE },
+	{ 0x1f0c, KEY_RADIO },		/* There's no indicator on this key */
+	{ 0x1f3c, KEY_ZOOM },		/* full */
+
+	{ 0x1f32, KEY_REWIND },		/* backward << */
+	{ 0x1f35, KEY_PLAY },
+	{ 0x1f34, KEY_FASTFORWARD },	/* forward >> */
+
+	{ 0x1f37, KEY_RECORD },		/* recording */
+	{ 0x1f36, KEY_STOP },
+	{ 0x1f30, KEY_PAUSE },		/* pause */
+
+	{ 0x1f24, KEY_PREVIOUSSONG },	/* replay |< */
+	{ 0x1f1e, KEY_NEXTSONG },	/* skip >| */
+
+	/*
+	 * Keycodes for DSR-0112 remote bundled with Haupauge MiniStick
+	 * Keycodes start with address = 0x1d
+	 */
+	{ 0x1d00, KEY_0 },
+	{ 0x1d01, KEY_1 },
+	{ 0x1d02, KEY_2 },
+	{ 0x1d03, KEY_3 },
+	{ 0x1d04, KEY_4 },
+	{ 0x1d05, KEY_5 },
+	{ 0x1d06, KEY_6 },
+	{ 0x1d07, KEY_7 },
+	{ 0x1d08, KEY_8 },
+	{ 0x1d09, KEY_9 },
+	{ 0x1d0a, KEY_TEXT },
+	{ 0x1d0d, KEY_MENU },
+	{ 0x1d0f, KEY_MUTE },
+	{ 0x1d10, KEY_VOLUMEUP },
+	{ 0x1d11, KEY_VOLUMEDOWN },
+	{ 0x1d12, KEY_PREVIOUS },        /* Prev.Ch .. ??? */
+	{ 0x1d14, KEY_UP },
+	{ 0x1d15, KEY_DOWN },
+	{ 0x1d16, KEY_LEFT },
+	{ 0x1d17, KEY_RIGHT },
+	{ 0x1d1c, KEY_TV },
+	{ 0x1d1e, KEY_NEXT },           /* >|             */
+	{ 0x1d1f, KEY_EXIT },
+	{ 0x1d20, KEY_CHANNELUP },
+	{ 0x1d21, KEY_CHANNELDOWN },
+	{ 0x1d24, KEY_LAST },           /* <|             */
+	{ 0x1d25, KEY_OK },
+	{ 0x1d30, KEY_PAUSE },
+	{ 0x1d32, KEY_REWIND },
+	{ 0x1d34, KEY_FASTFORWARD },
+	{ 0x1d35, KEY_PLAY },
+	{ 0x1d36, KEY_STOP },
+	{ 0x1d37, KEY_RECORD },
+	{ 0x1d3b, KEY_GOTO },
+	{ 0x1d3d, KEY_POWER },
+	{ 0x1d3f, KEY_HOME },
+
+	/*
+	 * Keycodes for the old Black Remote Controller
+	 * This one also uses RC-5 protocol
+	 * Keycodes start with address = 0x00
+	 */
+	{ 0x001f, KEY_TV },
+	{ 0x0020, KEY_CHANNELUP },
+	{ 0x000c, KEY_RADIO },
+
+	{ 0x0011, KEY_VOLUMEDOWN },
+	{ 0x002e, KEY_ZOOM },		/* full screen */
+	{ 0x0010, KEY_VOLUMEUP },
+
+	{ 0x000d, KEY_MUTE },
+	{ 0x0021, KEY_CHANNELDOWN },
+	{ 0x0022, KEY_VIDEO },		/* source */
+
+	{ 0x0001, KEY_1 },
+	{ 0x0002, KEY_2 },
+	{ 0x0003, KEY_3 },
+
+	{ 0x0004, KEY_4 },
+	{ 0x0005, KEY_5 },
+	{ 0x0006, KEY_6 },
+
+	{ 0x0007, KEY_7 },
+	{ 0x0008, KEY_8 },
+	{ 0x0009, KEY_9 },
+
+	{ 0x001e, KEY_RED },	/* Reserved */
+	{ 0x0000, KEY_0 },
+	{ 0x0026, KEY_SLEEP },	/* Minimize */
+};
+
+static struct rc_map_list rc5_hauppauge_new_map = {
+	.map = {
+		.scan    = rc5_hauppauge_new,
+		.size    = ARRAY_SIZE(rc5_hauppauge_new),
+		.rc_type = RC_TYPE_RC5,
+		.name    = RC_MAP_HAUPPAUGE,
+	}
+};
+
+static int __init init_rc_map_rc5_hauppauge_new(void)
+{
+	return rc_map_register(&rc5_hauppauge_new_map);
+}
+
+static void __exit exit_rc_map_rc5_hauppauge_new(void)
+{
+	rc_map_unregister(&rc5_hauppauge_new_map);
+}
+
+module_init(init_rc_map_rc5_hauppauge_new)
+module_exit(exit_rc_map_rc5_hauppauge_new)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
-/* rc5-hauppauge-new.h - Keytable for rc5_hauppauge_new Remote Controller
- *
- * keymap imported from ir-keymaps.c
- *
- * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <media/rc-map.h>
-
-/*
- * Hauppauge:the newer, gray remotes (seems there are multiple
- * slightly different versions), shipped with cx88+ivtv cards.
- *
- * This table contains the complete RC5 code, instead of just the data part
- */
-
-static struct rc_map_table rc5_hauppauge_new[] = {
-	/*
-	 * Remote Controller Hauppauge Gray found on modern devices
-	 * Keycodes start with address = 0x1e
-	 */
-
-	{ 0x1e3b, KEY_SELECT },		/* GO / house symbol */
-	{ 0x1e3d, KEY_POWER2 },		/* system power (green button) */
-
-	{ 0x1e1c, KEY_TV },
-	{ 0x1e18, KEY_VIDEO },		/* Videos */
-	{ 0x1e19, KEY_AUDIO },		/* Music */
-	{ 0x1e1a, KEY_CAMERA },		/* Pictures */
-
-	{ 0x1e1b, KEY_EPG },		/* Guide */
-	{ 0x1e0c, KEY_RADIO },
-
-	{ 0x1e14, KEY_UP },
-	{ 0x1e15, KEY_DOWN },
-	{ 0x1e16, KEY_LEFT },
-	{ 0x1e17, KEY_RIGHT },
-	{ 0x1e25, KEY_OK },		/* OK */
-
-	{ 0x1e1f, KEY_EXIT },		/* back/exit */
-	{ 0x1e0d, KEY_MENU },
-
-	{ 0x1e10, KEY_VOLUMEUP },
-	{ 0x1e11, KEY_VOLUMEDOWN },
-
-	{ 0x1e12, KEY_PREVIOUS },	/* previous channel */
-	{ 0x1e0f, KEY_MUTE },
-
-	{ 0x1e20, KEY_CHANNELUP },	/* channel / program + */
-	{ 0x1e21, KEY_CHANNELDOWN },	/* channel / program - */
-
-	{ 0x1e37, KEY_RECORD },		/* recording */
-	{ 0x1e36, KEY_STOP },
-
-	{ 0x1e32, KEY_REWIND },		/* backward << */
-	{ 0x1e35, KEY_PLAY },
-	{ 0x1e34, KEY_FASTFORWARD },	/* forward >> */
-
-	{ 0x1e24, KEY_PREVIOUSSONG },	/* replay |< */
-	{ 0x1e30, KEY_PAUSE },		/* pause */
-	{ 0x1e1e, KEY_NEXTSONG },	/* skip >| */
-
-	{ 0x1e01, KEY_1 },
-	{ 0x1e02, KEY_2 },
-	{ 0x1e03, KEY_3 },
-
-	{ 0x1e04, KEY_4 },
-	{ 0x1e05, KEY_5 },
-	{ 0x1e06, KEY_6 },
-
-	{ 0x1e07, KEY_7 },
-	{ 0x1e08, KEY_8 },
-	{ 0x1e09, KEY_9 },
-
-	{ 0x1e0a, KEY_TEXT },		/* keypad asterisk as well */
-	{ 0x1e00, KEY_0 },
-	{ 0x1e0e, KEY_SUBTITLE },	/* also the Pound key (#) */
-
-	{ 0x1e0b, KEY_RED },		/* red button */
-	{ 0x1e2e, KEY_GREEN },		/* green button */
-	{ 0x1e38, KEY_YELLOW },		/* yellow key */
-	{ 0x1e29, KEY_BLUE },		/* blue key */
-
-	/*
-	 * Old Remote Controller Hauppauge Gray with a golden screen
-	 * Keycodes start with address = 0x1f
-	 */
-	{ 0x1f3d, KEY_POWER2 },		/* system power (green button) */
-	{ 0x1f3b, KEY_SELECT },		/* GO */
-
-	/* Keys 0 to 9 */
-	{ 0x1f00, KEY_0 },
-	{ 0x1f01, KEY_1 },
-	{ 0x1f02, KEY_2 },
-	{ 0x1f03, KEY_3 },
-	{ 0x1f04, KEY_4 },
-	{ 0x1f05, KEY_5 },
-	{ 0x1f06, KEY_6 },
-	{ 0x1f07, KEY_7 },
-	{ 0x1f08, KEY_8 },
-	{ 0x1f09, KEY_9 },
-
-	{ 0x1f1f, KEY_EXIT },		/* back/exit */
-	{ 0x1f0d, KEY_MENU },
-
-	{ 0x1f10, KEY_VOLUMEUP },
-	{ 0x1f11, KEY_VOLUMEDOWN },
-	{ 0x1f20, KEY_CHANNELUP },	/* channel / program + */
-	{ 0x1f21, KEY_CHANNELDOWN },	/* channel / program - */
-	{ 0x1f25, KEY_ENTER },		/* OK */
-
-	{ 0x1f0b, KEY_RED },		/* red button */
-	{ 0x1f2e, KEY_GREEN },		/* green button */
-	{ 0x1f38, KEY_YELLOW },		/* yellow key */
-	{ 0x1f29, KEY_BLUE },		/* blue key */
-
-	{ 0x1f0f, KEY_MUTE },
-	{ 0x1f0c, KEY_RADIO },		/* There's no indicator on this key */
-	{ 0x1f3c, KEY_ZOOM },		/* full */
-
-	{ 0x1f32, KEY_REWIND },		/* backward << */
-	{ 0x1f35, KEY_PLAY },
-	{ 0x1f34, KEY_FASTFORWARD },	/* forward >> */
-
-	{ 0x1f37, KEY_RECORD },		/* recording */
-	{ 0x1f36, KEY_STOP },
-	{ 0x1f30, KEY_PAUSE },		/* pause */
-
-	{ 0x1f24, KEY_PREVIOUSSONG },	/* replay |< */
-	{ 0x1f1e, KEY_NEXTSONG },	/* skip >| */
-
-	/*
-	 * Keycodes for DSR-0112 remote bundled with Haupauge MiniStick
-	 * Keycodes start with address = 0x1d
-	 */
-	{ 0x1d00, KEY_0 },
-	{ 0x1d01, KEY_1 },
-	{ 0x1d02, KEY_2 },
-	{ 0x1d03, KEY_3 },
-	{ 0x1d04, KEY_4 },
-	{ 0x1d05, KEY_5 },
-	{ 0x1d06, KEY_6 },
-	{ 0x1d07, KEY_7 },
-	{ 0x1d08, KEY_8 },
-	{ 0x1d09, KEY_9 },
-	{ 0x1d0a, KEY_TEXT },
-	{ 0x1d0d, KEY_MENU },
-	{ 0x1d0f, KEY_MUTE },
-	{ 0x1d10, KEY_VOLUMEUP },
-	{ 0x1d11, KEY_VOLUMEDOWN },
-	{ 0x1d12, KEY_PREVIOUS },        /* Prev.Ch .. ??? */
-	{ 0x1d14, KEY_UP },
-	{ 0x1d15, KEY_DOWN },
-	{ 0x1d16, KEY_LEFT },
-	{ 0x1d17, KEY_RIGHT },
-	{ 0x1d1c, KEY_TV },
-	{ 0x1d1e, KEY_NEXT },           /* >|             */
-	{ 0x1d1f, KEY_EXIT },
-	{ 0x1d20, KEY_CHANNELUP },
-	{ 0x1d21, KEY_CHANNELDOWN },
-	{ 0x1d24, KEY_LAST },           /* <|             */
-	{ 0x1d25, KEY_OK },
-	{ 0x1d30, KEY_PAUSE },
-	{ 0x1d32, KEY_REWIND },
-	{ 0x1d34, KEY_FASTFORWARD },
-	{ 0x1d35, KEY_PLAY },
-	{ 0x1d36, KEY_STOP },
-	{ 0x1d37, KEY_RECORD },
-	{ 0x1d3b, KEY_GOTO },
-	{ 0x1d3d, KEY_POWER },
-	{ 0x1d3f, KEY_HOME },
-
-	/*
-	 * Keycodes for the old Black Remote Controller
-	 * This one also uses RC-5 protocol
-	 * Keycodes start with address = 0x00
-	 */
-	{ 0x001f, KEY_TV },
-	{ 0x0020, KEY_CHANNELUP },
-	{ 0x000c, KEY_RADIO },
-
-	{ 0x0011, KEY_VOLUMEDOWN },
-	{ 0x002e, KEY_ZOOM },		/* full screen */
-	{ 0x0010, KEY_VOLUMEUP },
-
-	{ 0x000d, KEY_MUTE },
-	{ 0x0021, KEY_CHANNELDOWN },
-	{ 0x0022, KEY_VIDEO },		/* source */
-
-	{ 0x0001, KEY_1 },
-	{ 0x0002, KEY_2 },
-	{ 0x0003, KEY_3 },
-
-	{ 0x0004, KEY_4 },
-	{ 0x0005, KEY_5 },
-	{ 0x0006, KEY_6 },
-
-	{ 0x0007, KEY_7 },
-	{ 0x0008, KEY_8 },
-	{ 0x0009, KEY_9 },
-
-	{ 0x001e, KEY_RED },	/* Reserved */
-	{ 0x0000, KEY_0 },
-	{ 0x0026, KEY_SLEEP },	/* Minimize */
-};
-
-static struct rc_map_list rc5_hauppauge_new_map = {
-	.map = {
-		.scan    = rc5_hauppauge_new,
-		.size    = ARRAY_SIZE(rc5_hauppauge_new),
-		.rc_type = RC_TYPE_RC5,
-		.name    = RC_MAP_RC5_HAUPPAUGE_NEW,
-	}
-};
-
-static int __init init_rc_map_rc5_hauppauge_new(void)
-{
-	return rc_map_register(&rc5_hauppauge_new_map);
-}
-
-static void __exit exit_rc_map_rc5_hauppauge_new(void)
-{
-	rc_map_unregister(&rc5_hauppauge_new_map);
-}
-
-module_init(init_rc_map_rc5_hauppauge_new)
-module_exit(exit_rc_map_rc5_hauppauge_new)
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
@@ -186,7 +186,7 @@
 		 * remotes, but we should have something handy,
 		 * to allow testing it
 		 */
-		.rc_map = RC_MAP_RC5_HAUPPAUGE_NEW,
+		.rc_map = RC_MAP_HAUPPAUGE,
 		.name = "Conexant Hybrid TV (cx231xx) MCE IR",
 	},
 	[CX_HYBRID_TV] = {
@@ -264,7 +264,7 @@
 		driver_type = RC_DRIVER_IR_RAW;
 		allowed_protos = RC_TYPE_ALL;
 		/* The grey Hauppauge RC-5 remote */
-		rc_map = RC_MAP_RC5_HAUPPAUGE_NEW;
+		rc_map = RC_MAP_HAUPPAUGE;
 		break;
 	case CX23885_BOARD_TEVII_S470:
 		/* Integrated CX23885 IR controller */
@@ -911,7 +911,7 @@
 		.mts_firmware   = 1,
 		.has_dvb        = 1,
 		.dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-		.ir_codes       = RC_MAP_RC5_HAUPPAUGE_NEW,
+		.ir_codes       = RC_MAP_HAUPPAUGE,
 		.decoder        = EM28XX_TVP5150,
 		.input          = { {
 			.type     = EM28XX_VMUX_TELEVISION,
@@ -2430,7 +2430,7 @@
 		dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
 		break;
 	case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
-		dev->init_data.ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW;
+		dev->init_data.ir_codes = RC_MAP_HAUPPAUGE;
 		dev->init_data.get_key = em28xx_get_key_em_haup;
 		dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
 		break;
@@ -94,7 +94,7 @@
 #define RC_MAP_GADMEI_RM008Z             "rc-gadmei-rm008z"
 #define RC_MAP_GENIUS_TVGO_A11MCE        "rc-genius-tvgo-a11mce"
 #define RC_MAP_GOTVIEW7135               "rc-gotview7135"
-#define RC_MAP_HAUPPAUGE_NEW             "rc-hauppauge-new"
+#define RC_MAP_HAUPPAUGE_NEW             "rc-hauppauge"
 #define RC_MAP_IMON_MCE                  "rc-imon-mce"
 #define RC_MAP_IMON_PAD                  "rc-imon-pad"
 #define RC_MAP_IODATA_BCTV7E             "rc-iodata-bctv7e"
@@ -125,7 +125,7 @@
 #define RC_MAP_PROTEUS_2309              "rc-proteus-2309"
 #define RC_MAP_PURPLETV                  "rc-purpletv"
 #define RC_MAP_PV951                     "rc-pv951"
-#define RC_MAP_RC5_HAUPPAUGE_NEW         "rc-rc5-hauppauge-new"
+#define RC_MAP_HAUPPAUGE                 "rc-hauppauge"
 #define RC_MAP_RC5_TV                    "rc-rc5-tv"
 #define RC_MAP_RC6_MCE                   "rc-rc6-mce"
 #define RC_MAP_REAL_AUDIO_220_32_KEYS    "rc-real-audio-220-32-keys"
...	...	@@ -64,7 +64,7 @@
64	64	.type = SMS_NOVA_B0,
65	65	.fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw",
66	66	.fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
67		- .rc_codes = RC_MAP_RC5_HAUPPAUGE_NEW,
	67	+ .rc_codes = RC_MAP_HAUPPAUGE,
68	68	.board_cfg.leds_power = 26,
69	69	.board_cfg.led0 = 27,
70	70	.board_cfg.led1 = 28,
...	...	@@ -68,7 +68,7 @@
68	68	rc-proteus-2309.o \
69	69	rc-purpletv.o \
70	70	rc-pv951.o \
71		- rc-rc5-hauppauge-new.o \
	71	+ rc-hauppauge.o \
72	72	rc-rc5-tv.o \
73	73	rc-rc6-mce.o \
74	74	rc-real-audio-220-32-keys.o \
	1	+/* rc-hauppauge.c - Keytable for Hauppauge Remote Controllers
	2	+ *
	3	+ * keymap imported from ir-keymaps.c
	4	+ *
	5	+ * This map currently contains the code for four different RCs:
	6	+ * - New Hauppauge Gray;
	7	+ * - Old Hauppauge Gray (with a golden screen for media keys);
	8	+ * - Hauppauge Black;
	9	+ * - DSR-0112 remote bundled with Haupauge MiniStick.
	10	+ *
	11	+ * Copyright (c) 2010-2011 by Mauro Carvalho Chehab <mchehab@redhat.com>
	12	+ *
	13	+ * This program is free software; you can redistribute it and/or modify
	14	+ * it under the terms of the GNU General Public License as published by
	15	+ * the Free Software Foundation; either version 2 of the License, or
	16	+ * (at your option) any later version.
	17	+ */
	18	+
	19	+#include <media/rc-map.h>
	20	+
	21	+/*
	22	+ * Hauppauge:the newer, gray remotes (seems there are multiple
	23	+ * slightly different versions), shipped with cx88+ivtv cards.
	24	+ *
	25	+ * This table contains the complete RC5 code, instead of just the data part
	26	+ */
	27	+
	28	+static struct rc_map_table rc5_hauppauge_new[] = {
	29	+ /*
	30	+ * Remote Controller Hauppauge Gray found on modern devices
	31	+ * Keycodes start with address = 0x1e
	32	+ */
	33	+
	34	+ { 0x1e3b, KEY_SELECT }, /* GO / house symbol */
	35	+ { 0x1e3d, KEY_POWER2 }, /* system power (green button) */
	36	+
	37	+ { 0x1e1c, KEY_TV },
	38	+ { 0x1e18, KEY_VIDEO }, /* Videos */
	39	+ { 0x1e19, KEY_AUDIO }, /* Music */
	40	+ { 0x1e1a, KEY_CAMERA }, /* Pictures */
	41	+
	42	+ { 0x1e1b, KEY_EPG }, /* Guide */
	43	+ { 0x1e0c, KEY_RADIO },
	44	+
	45	+ { 0x1e14, KEY_UP },
	46	+ { 0x1e15, KEY_DOWN },
	47	+ { 0x1e16, KEY_LEFT },
	48	+ { 0x1e17, KEY_RIGHT },
	49	+ { 0x1e25, KEY_OK }, /* OK */
	50	+
	51	+ { 0x1e1f, KEY_EXIT }, /* back/exit */
	52	+ { 0x1e0d, KEY_MENU },
	53	+
	54	+ { 0x1e10, KEY_VOLUMEUP },
	55	+ { 0x1e11, KEY_VOLUMEDOWN },
	56	+
	57	+ { 0x1e12, KEY_PREVIOUS }, /* previous channel */
	58	+ { 0x1e0f, KEY_MUTE },
	59	+
	60	+ { 0x1e20, KEY_CHANNELUP }, /* channel / program + */
	61	+ { 0x1e21, KEY_CHANNELDOWN }, /* channel / program - */
	62	+
	63	+ { 0x1e37, KEY_RECORD }, /* recording */
	64	+ { 0x1e36, KEY_STOP },
	65	+
	66	+ { 0x1e32, KEY_REWIND }, /* backward << */
	67	+ { 0x1e35, KEY_PLAY },
	68	+ { 0x1e34, KEY_FASTFORWARD }, /* forward >> */
	69	+
	70	+ { 0x1e24, KEY_PREVIOUSSONG }, /* replay \|< */
	71	+ { 0x1e30, KEY_PAUSE }, /* pause */
	72	+ { 0x1e1e, KEY_NEXTSONG }, /* skip >\| */
	73	+
	74	+ { 0x1e01, KEY_1 },
	75	+ { 0x1e02, KEY_2 },
	76	+ { 0x1e03, KEY_3 },
	77	+
	78	+ { 0x1e04, KEY_4 },
	79	+ { 0x1e05, KEY_5 },
	80	+ { 0x1e06, KEY_6 },
	81	+
	82	+ { 0x1e07, KEY_7 },
	83	+ { 0x1e08, KEY_8 },
	84	+ { 0x1e09, KEY_9 },
	85	+
	86	+ { 0x1e0a, KEY_TEXT }, /* keypad asterisk as well */
	87	+ { 0x1e00, KEY_0 },
	88	+ { 0x1e0e, KEY_SUBTITLE }, /* also the Pound key (#) */
	89	+
	90	+ { 0x1e0b, KEY_RED }, /* red button */
	91	+ { 0x1e2e, KEY_GREEN }, /* green button */
	92	+ { 0x1e38, KEY_YELLOW }, /* yellow key */
	93	+ { 0x1e29, KEY_BLUE }, /* blue key */
	94	+
	95	+ /*
	96	+ * Old Remote Controller Hauppauge Gray with a golden screen
	97	+ * Keycodes start with address = 0x1f
	98	+ */
	99	+ { 0x1f3d, KEY_POWER2 }, /* system power (green button) */
	100	+ { 0x1f3b, KEY_SELECT }, /* GO */
	101	+
	102	+ /* Keys 0 to 9 */
	103	+ { 0x1f00, KEY_0 },
	104	+ { 0x1f01, KEY_1 },
	105	+ { 0x1f02, KEY_2 },
	106	+ { 0x1f03, KEY_3 },
	107	+ { 0x1f04, KEY_4 },
	108	+ { 0x1f05, KEY_5 },
	109	+ { 0x1f06, KEY_6 },
	110	+ { 0x1f07, KEY_7 },
	111	+ { 0x1f08, KEY_8 },
	112	+ { 0x1f09, KEY_9 },
	113	+
	114	+ { 0x1f1f, KEY_EXIT }, /* back/exit */
	115	+ { 0x1f0d, KEY_MENU },
	116	+
	117	+ { 0x1f10, KEY_VOLUMEUP },
	118	+ { 0x1f11, KEY_VOLUMEDOWN },
	119	+ { 0x1f20, KEY_CHANNELUP }, /* channel / program + */
	120	+ { 0x1f21, KEY_CHANNELDOWN }, /* channel / program - */
	121	+ { 0x1f25, KEY_ENTER }, /* OK */
	122	+
	123	+ { 0x1f0b, KEY_RED }, /* red button */
	124	+ { 0x1f2e, KEY_GREEN }, /* green button */
	125	+ { 0x1f38, KEY_YELLOW }, /* yellow key */
	126	+ { 0x1f29, KEY_BLUE }, /* blue key */
	127	+
	128	+ { 0x1f0f, KEY_MUTE },
	129	+ { 0x1f0c, KEY_RADIO }, /* There's no indicator on this key */
	130	+ { 0x1f3c, KEY_ZOOM }, /* full */
	131	+
	132	+ { 0x1f32, KEY_REWIND }, /* backward << */
	133	+ { 0x1f35, KEY_PLAY },
	134	+ { 0x1f34, KEY_FASTFORWARD }, /* forward >> */
	135	+
	136	+ { 0x1f37, KEY_RECORD }, /* recording */
	137	+ { 0x1f36, KEY_STOP },
	138	+ { 0x1f30, KEY_PAUSE }, /* pause */
	139	+
	140	+ { 0x1f24, KEY_PREVIOUSSONG }, /* replay \|< */
	141	+ { 0x1f1e, KEY_NEXTSONG }, /* skip >\| */
	142	+
	143	+ /*
	144	+ * Keycodes for DSR-0112 remote bundled with Haupauge MiniStick
	145	+ * Keycodes start with address = 0x1d
	146	+ */
	147	+ { 0x1d00, KEY_0 },
	148	+ { 0x1d01, KEY_1 },
	149	+ { 0x1d02, KEY_2 },
	150	+ { 0x1d03, KEY_3 },
	151	+ { 0x1d04, KEY_4 },
	152	+ { 0x1d05, KEY_5 },
	153	+ { 0x1d06, KEY_6 },
	154	+ { 0x1d07, KEY_7 },
	155	+ { 0x1d08, KEY_8 },
	156	+ { 0x1d09, KEY_9 },
	157	+ { 0x1d0a, KEY_TEXT },
	158	+ { 0x1d0d, KEY_MENU },
	159	+ { 0x1d0f, KEY_MUTE },
	160	+ { 0x1d10, KEY_VOLUMEUP },
	161	+ { 0x1d11, KEY_VOLUMEDOWN },
	162	+ { 0x1d12, KEY_PREVIOUS }, /* Prev.Ch .. ??? */
	163	+ { 0x1d14, KEY_UP },
	164	+ { 0x1d15, KEY_DOWN },
	165	+ { 0x1d16, KEY_LEFT },
	166	+ { 0x1d17, KEY_RIGHT },
	167	+ { 0x1d1c, KEY_TV },
	168	+ { 0x1d1e, KEY_NEXT }, /* >\| */
	169	+ { 0x1d1f, KEY_EXIT },
	170	+ { 0x1d20, KEY_CHANNELUP },
	171	+ { 0x1d21, KEY_CHANNELDOWN },
	172	+ { 0x1d24, KEY_LAST }, /* <\| */
	173	+ { 0x1d25, KEY_OK },
	174	+ { 0x1d30, KEY_PAUSE },
	175	+ { 0x1d32, KEY_REWIND },
	176	+ { 0x1d34, KEY_FASTFORWARD },
	177	+ { 0x1d35, KEY_PLAY },
	178	+ { 0x1d36, KEY_STOP },
	179	+ { 0x1d37, KEY_RECORD },
	180	+ { 0x1d3b, KEY_GOTO },
	181	+ { 0x1d3d, KEY_POWER },
	182	+ { 0x1d3f, KEY_HOME },
	183	+
	184	+ /*
	185	+ * Keycodes for the old Black Remote Controller
	186	+ * This one also uses RC-5 protocol
	187	+ * Keycodes start with address = 0x00
	188	+ */
	189	+ { 0x001f, KEY_TV },
	190	+ { 0x0020, KEY_CHANNELUP },
	191	+ { 0x000c, KEY_RADIO },
	192	+
	193	+ { 0x0011, KEY_VOLUMEDOWN },
	194	+ { 0x002e, KEY_ZOOM }, /* full screen */
	195	+ { 0x0010, KEY_VOLUMEUP },
	196	+
	197	+ { 0x000d, KEY_MUTE },
	198	+ { 0x0021, KEY_CHANNELDOWN },
	199	+ { 0x0022, KEY_VIDEO }, /* source */
	200	+
	201	+ { 0x0001, KEY_1 },
	202	+ { 0x0002, KEY_2 },
	203	+ { 0x0003, KEY_3 },
	204	+
	205	+ { 0x0004, KEY_4 },
	206	+ { 0x0005, KEY_5 },
	207	+ { 0x0006, KEY_6 },
	208	+
	209	+ { 0x0007, KEY_7 },
	210	+ { 0x0008, KEY_8 },
	211	+ { 0x0009, KEY_9 },
	212	+
	213	+ { 0x001e, KEY_RED }, /* Reserved */
	214	+ { 0x0000, KEY_0 },
	215	+ { 0x0026, KEY_SLEEP }, /* Minimize */
	216	+};
	217	+
	218	+static struct rc_map_list rc5_hauppauge_new_map = {
	219	+ .map = {
	220	+ .scan = rc5_hauppauge_new,
	221	+ .size = ARRAY_SIZE(rc5_hauppauge_new),
	222	+ .rc_type = RC_TYPE_RC5,
	223	+ .name = RC_MAP_HAUPPAUGE,
	224	+ }
	225	+};
	226	+
	227	+static int __init init_rc_map_rc5_hauppauge_new(void)
	228	+{
	229	+ return rc_map_register(&rc5_hauppauge_new_map);
	230	+}
	231	+
	232	+static void __exit exit_rc_map_rc5_hauppauge_new(void)
	233	+{
	234	+ rc_map_unregister(&rc5_hauppauge_new_map);
	235	+}
	236	+
	237	+module_init(init_rc_map_rc5_hauppauge_new)
	238	+module_exit(exit_rc_map_rc5_hauppauge_new)
	239	+
	240	+MODULE_LICENSE("GPL");
	241	+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
1		-/* rc5-hauppauge-new.h - Keytable for rc5_hauppauge_new Remote Controller
2		- *
3		- * keymap imported from ir-keymaps.c
4		- *
5		- * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
6		- *
7		- * This program is free software; you can redistribute it and/or modify
8		- * it under the terms of the GNU General Public License as published by
9		- * the Free Software Foundation; either version 2 of the License, or
10		- * (at your option) any later version.
11		- */
12		-
13		-#include <media/rc-map.h>
14		-
15		-/*
16		- * Hauppauge:the newer, gray remotes (seems there are multiple
17		- * slightly different versions), shipped with cx88+ivtv cards.
18		- *
19		- * This table contains the complete RC5 code, instead of just the data part
20		- */
21		-
22		-static struct rc_map_table rc5_hauppauge_new[] = {
23		- /*
24		- * Remote Controller Hauppauge Gray found on modern devices
25		- * Keycodes start with address = 0x1e
26		- */
27		-
28		- { 0x1e3b, KEY_SELECT }, /* GO / house symbol */
29		- { 0x1e3d, KEY_POWER2 }, /* system power (green button) */
30		-
31		- { 0x1e1c, KEY_TV },
32		- { 0x1e18, KEY_VIDEO }, /* Videos */
33		- { 0x1e19, KEY_AUDIO }, /* Music */
34		- { 0x1e1a, KEY_CAMERA }, /* Pictures */
35		-
36		- { 0x1e1b, KEY_EPG }, /* Guide */
37		- { 0x1e0c, KEY_RADIO },
38		-
39		- { 0x1e14, KEY_UP },
40		- { 0x1e15, KEY_DOWN },
41		- { 0x1e16, KEY_LEFT },
42		- { 0x1e17, KEY_RIGHT },
43		- { 0x1e25, KEY_OK }, /* OK */
44		-
45		- { 0x1e1f, KEY_EXIT }, /* back/exit */
46		- { 0x1e0d, KEY_MENU },
47		-
48		- { 0x1e10, KEY_VOLUMEUP },
49		- { 0x1e11, KEY_VOLUMEDOWN },
50		-
51		- { 0x1e12, KEY_PREVIOUS }, /* previous channel */
52		- { 0x1e0f, KEY_MUTE },
53		-
54		- { 0x1e20, KEY_CHANNELUP }, /* channel / program + */
55		- { 0x1e21, KEY_CHANNELDOWN }, /* channel / program - */
56		-
57		- { 0x1e37, KEY_RECORD }, /* recording */
58		- { 0x1e36, KEY_STOP },
59		-
60		- { 0x1e32, KEY_REWIND }, /* backward << */
61		- { 0x1e35, KEY_PLAY },
62		- { 0x1e34, KEY_FASTFORWARD }, /* forward >> */
63		-
64		- { 0x1e24, KEY_PREVIOUSSONG }, /* replay \|< */
65		- { 0x1e30, KEY_PAUSE }, /* pause */
66		- { 0x1e1e, KEY_NEXTSONG }, /* skip >\| */
67		-
68		- { 0x1e01, KEY_1 },
69		- { 0x1e02, KEY_2 },
70		- { 0x1e03, KEY_3 },
71		-
72		- { 0x1e04, KEY_4 },
73		- { 0x1e05, KEY_5 },
74		- { 0x1e06, KEY_6 },
75		-
76		- { 0x1e07, KEY_7 },
77		- { 0x1e08, KEY_8 },
78		- { 0x1e09, KEY_9 },
79		-
80		- { 0x1e0a, KEY_TEXT }, /* keypad asterisk as well */
81		- { 0x1e00, KEY_0 },
82		- { 0x1e0e, KEY_SUBTITLE }, /* also the Pound key (#) */
83		-
84		- { 0x1e0b, KEY_RED }, /* red button */
85		- { 0x1e2e, KEY_GREEN }, /* green button */
86		- { 0x1e38, KEY_YELLOW }, /* yellow key */
87		- { 0x1e29, KEY_BLUE }, /* blue key */
88		-
89		- /*
90		- * Old Remote Controller Hauppauge Gray with a golden screen
91		- * Keycodes start with address = 0x1f
92		- */
93		- { 0x1f3d, KEY_POWER2 }, /* system power (green button) */
94		- { 0x1f3b, KEY_SELECT }, /* GO */
95		-
96		- /* Keys 0 to 9 */
97		- { 0x1f00, KEY_0 },
98		- { 0x1f01, KEY_1 },
99		- { 0x1f02, KEY_2 },
100		- { 0x1f03, KEY_3 },
101		- { 0x1f04, KEY_4 },
102		- { 0x1f05, KEY_5 },
103		- { 0x1f06, KEY_6 },
104		- { 0x1f07, KEY_7 },
105		- { 0x1f08, KEY_8 },
106		- { 0x1f09, KEY_9 },
107		-
108		- { 0x1f1f, KEY_EXIT }, /* back/exit */
109		- { 0x1f0d, KEY_MENU },
110		-
111		- { 0x1f10, KEY_VOLUMEUP },
112		- { 0x1f11, KEY_VOLUMEDOWN },
113		- { 0x1f20, KEY_CHANNELUP }, /* channel / program + */
114		- { 0x1f21, KEY_CHANNELDOWN }, /* channel / program - */
115		- { 0x1f25, KEY_ENTER }, /* OK */
116		-
117		- { 0x1f0b, KEY_RED }, /* red button */
118		- { 0x1f2e, KEY_GREEN }, /* green button */
119		- { 0x1f38, KEY_YELLOW }, /* yellow key */
120		- { 0x1f29, KEY_BLUE }, /* blue key */
121		-
122		- { 0x1f0f, KEY_MUTE },
123		- { 0x1f0c, KEY_RADIO }, /* There's no indicator on this key */
124		- { 0x1f3c, KEY_ZOOM }, /* full */
125		-
126		- { 0x1f32, KEY_REWIND }, /* backward << */
127		- { 0x1f35, KEY_PLAY },
128		- { 0x1f34, KEY_FASTFORWARD }, /* forward >> */
129		-
130		- { 0x1f37, KEY_RECORD }, /* recording */
131		- { 0x1f36, KEY_STOP },
132		- { 0x1f30, KEY_PAUSE }, /* pause */
133		-
134		- { 0x1f24, KEY_PREVIOUSSONG }, /* replay \|< */
135		- { 0x1f1e, KEY_NEXTSONG }, /* skip >\| */
136		-
137		- /*
138		- * Keycodes for DSR-0112 remote bundled with Haupauge MiniStick
139		- * Keycodes start with address = 0x1d
140		- */
141		- { 0x1d00, KEY_0 },
142		- { 0x1d01, KEY_1 },
143		- { 0x1d02, KEY_2 },
144		- { 0x1d03, KEY_3 },
145		- { 0x1d04, KEY_4 },
146		- { 0x1d05, KEY_5 },
147		- { 0x1d06, KEY_6 },
148		- { 0x1d07, KEY_7 },
149		- { 0x1d08, KEY_8 },
150		- { 0x1d09, KEY_9 },
151		- { 0x1d0a, KEY_TEXT },
152		- { 0x1d0d, KEY_MENU },
153		- { 0x1d0f, KEY_MUTE },
154		- { 0x1d10, KEY_VOLUMEUP },
155		- { 0x1d11, KEY_VOLUMEDOWN },
156		- { 0x1d12, KEY_PREVIOUS }, /* Prev.Ch .. ??? */
157		- { 0x1d14, KEY_UP },
158		- { 0x1d15, KEY_DOWN },
159		- { 0x1d16, KEY_LEFT },
160		- { 0x1d17, KEY_RIGHT },
161		- { 0x1d1c, KEY_TV },
162		- { 0x1d1e, KEY_NEXT }, /* >\| */
163		- { 0x1d1f, KEY_EXIT },
164		- { 0x1d20, KEY_CHANNELUP },
165		- { 0x1d21, KEY_CHANNELDOWN },
166		- { 0x1d24, KEY_LAST }, /* <\| */
167		- { 0x1d25, KEY_OK },
168		- { 0x1d30, KEY_PAUSE },
169		- { 0x1d32, KEY_REWIND },
170		- { 0x1d34, KEY_FASTFORWARD },
171		- { 0x1d35, KEY_PLAY },
172		- { 0x1d36, KEY_STOP },
173		- { 0x1d37, KEY_RECORD },
174		- { 0x1d3b, KEY_GOTO },
175		- { 0x1d3d, KEY_POWER },
176		- { 0x1d3f, KEY_HOME },
177		-
178		- /*
179		- * Keycodes for the old Black Remote Controller
180		- * This one also uses RC-5 protocol
181		- * Keycodes start with address = 0x00
182		- */
183		- { 0x001f, KEY_TV },
184		- { 0x0020, KEY_CHANNELUP },
185		- { 0x000c, KEY_RADIO },
186		-
187		- { 0x0011, KEY_VOLUMEDOWN },
188		- { 0x002e, KEY_ZOOM }, /* full screen */
189		- { 0x0010, KEY_VOLUMEUP },
190		-
191		- { 0x000d, KEY_MUTE },
192		- { 0x0021, KEY_CHANNELDOWN },
193		- { 0x0022, KEY_VIDEO }, /* source */
194		-
195		- { 0x0001, KEY_1 },
196		- { 0x0002, KEY_2 },
197		- { 0x0003, KEY_3 },
198		-
199		- { 0x0004, KEY_4 },
200		- { 0x0005, KEY_5 },
201		- { 0x0006, KEY_6 },
202		-
203		- { 0x0007, KEY_7 },
204		- { 0x0008, KEY_8 },
205		- { 0x0009, KEY_9 },
206		-
207		- { 0x001e, KEY_RED }, /* Reserved */
208		- { 0x0000, KEY_0 },
209		- { 0x0026, KEY_SLEEP }, /* Minimize */
210		-};
211		-
212		-static struct rc_map_list rc5_hauppauge_new_map = {
213		- .map = {
214		- .scan = rc5_hauppauge_new,
215		- .size = ARRAY_SIZE(rc5_hauppauge_new),
216		- .rc_type = RC_TYPE_RC5,
217		- .name = RC_MAP_RC5_HAUPPAUGE_NEW,
218		- }
219		-};
220		-
221		-static int __init init_rc_map_rc5_hauppauge_new(void)
222		-{
223		- return rc_map_register(&rc5_hauppauge_new_map);
224		-}
225		-
226		-static void __exit exit_rc_map_rc5_hauppauge_new(void)
227		-{
228		- rc_map_unregister(&rc5_hauppauge_new_map);
229		-}
230		-
231		-module_init(init_rc_map_rc5_hauppauge_new)
232		-module_exit(exit_rc_map_rc5_hauppauge_new)
233		-
234		-MODULE_LICENSE("GPL");
235		-MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
...	...	@@ -186,7 +186,7 @@
186	186	* remotes, but we should have something handy,
187	187	* to allow testing it
188	188	*/
189		- .rc_map = RC_MAP_RC5_HAUPPAUGE_NEW,
	189	+ .rc_map = RC_MAP_HAUPPAUGE,
190	190	.name = "Conexant Hybrid TV (cx231xx) MCE IR",
191	191	},
192	192	[CX_HYBRID_TV] = {
...	...	@@ -264,7 +264,7 @@
264	264	driver_type = RC_DRIVER_IR_RAW;
265	265	allowed_protos = RC_TYPE_ALL;
266	266	/* The grey Hauppauge RC-5 remote */
267		- rc_map = RC_MAP_RC5_HAUPPAUGE_NEW;
	267	+ rc_map = RC_MAP_HAUPPAUGE;
268	268	break;
269	269	case CX23885_BOARD_TEVII_S470:
270	270	/* Integrated CX23885 IR controller */
...	...	@@ -911,7 +911,7 @@
911	911	.mts_firmware = 1,
912	912	.has_dvb = 1,
913	913	.dvb_gpio = hauppauge_wintv_hvr_900_digital,
914		- .ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW,
	914	+ .ir_codes = RC_MAP_HAUPPAUGE,
915	915	.decoder = EM28XX_TVP5150,
916	916	.input = { {
917	917	.type = EM28XX_VMUX_TELEVISION,
...	...	@@ -2430,7 +2430,7 @@
2430	2430	dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
2431	2431	break;
2432	2432	case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
2433		- dev->init_data.ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW;
	2433	+ dev->init_data.ir_codes = RC_MAP_HAUPPAUGE;
2434	2434	dev->init_data.get_key = em28xx_get_key_em_haup;
2435	2435	dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
2436	2436	break;
...	...	@@ -94,7 +94,7 @@
94	94	#define RC_MAP_GADMEI_RM008Z "rc-gadmei-rm008z"
95	95	#define RC_MAP_GENIUS_TVGO_A11MCE "rc-genius-tvgo-a11mce"
96	96	#define RC_MAP_GOTVIEW7135 "rc-gotview7135"
97		-#define RC_MAP_HAUPPAUGE_NEW "rc-hauppauge-new"
	97	+#define RC_MAP_HAUPPAUGE_NEW "rc-hauppauge"
98	98	#define RC_MAP_IMON_MCE "rc-imon-mce"
99	99	#define RC_MAP_IMON_PAD "rc-imon-pad"
100	100	#define RC_MAP_IODATA_BCTV7E "rc-iodata-bctv7e"
...	...	@@ -125,7 +125,7 @@
125	125	#define RC_MAP_PROTEUS_2309 "rc-proteus-2309"
126	126	#define RC_MAP_PURPLETV "rc-purpletv"
127	127	#define RC_MAP_PV951 "rc-pv951"
128		-#define RC_MAP_RC5_HAUPPAUGE_NEW "rc-rc5-hauppauge-new"
	128	+#define RC_MAP_HAUPPAUGE "rc-hauppauge"
129	129	#define RC_MAP_RC5_TV "rc-rc5-tv"
130	130	#define RC_MAP_RC6_MCE "rc-rc6-mce"
131	131	#define RC_MAP_REAL_AUDIO_220_32_KEYS "rc-real-audio-220-32-keys"