aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-01-24 10:18:47 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 18:24:14 -0400
commit15195d3a83b59f0ca3bed52cbe5524042ce13fd6 (patch)
tree0915c3f1d4e0dfacaf196c60e5e297e0388a3be7
parent0548757419c974d8c0851c13279b2c89a12b2978 (diff)
[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>
-rw-r--r--drivers/media/dvb/siano/sms-cards.c2
-rw-r--r--drivers/media/rc/keymaps/Makefile2
-rw-r--r--drivers/media/rc/keymaps/rc-hauppauge.c (renamed from drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c)12
-rw-r--r--drivers/media/rc/mceusb.c2
-rw-r--r--drivers/media/video/cx23885/cx23885-input.c2
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
-rw-r--r--include/media/rc-map.h4
7 files changed, 17 insertions, 11 deletions
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index 25b43e587fa..af121db88ea 100644
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -64,7 +64,7 @@ static struct sms_board sms_boards[] = {
64 .type = SMS_NOVA_B0, 64 .type = SMS_NOVA_B0,
65 .fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw", 65 .fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw",
66 .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw", 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 .board_cfg.leds_power = 26, 68 .board_cfg.leds_power = 26,
69 .board_cfg.led0 = 27, 69 .board_cfg.led0 = 27,
70 .board_cfg.led1 = 28, 70 .board_cfg.led1 = 28,
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index cb721216571..1f446f99b61 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -68,7 +68,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
68 rc-proteus-2309.o \ 68 rc-proteus-2309.o \
69 rc-purpletv.o \ 69 rc-purpletv.o \
70 rc-pv951.o \ 70 rc-pv951.o \
71 rc-rc5-hauppauge-new.o \ 71 rc-hauppauge.o \
72 rc-rc5-tv.o \ 72 rc-rc5-tv.o \
73 rc-rc6-mce.o \ 73 rc-rc6-mce.o \
74 rc-real-audio-220-32-keys.o \ 74 rc-real-audio-220-32-keys.o \
diff --git a/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c b/drivers/media/rc/keymaps/rc-hauppauge.c
index cb312dae6fa..cd3db777977 100644
--- a/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
+++ b/drivers/media/rc/keymaps/rc-hauppauge.c
@@ -1,8 +1,14 @@
1/* rc5-hauppauge-new.h - Keytable for rc5_hauppauge_new Remote Controller 1/* rc-hauppauge.c - Keytable for Hauppauge Remote Controllers
2 * 2 *
3 * keymap imported from ir-keymaps.c 3 * keymap imported from ir-keymaps.c
4 * 4 *
5 * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com> 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>
6 * 12 *
7 * This program is free software; you can redistribute it and/or modify 13 * 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 14 * it under the terms of the GNU General Public License as published by
@@ -214,7 +220,7 @@ static struct rc_map_list rc5_hauppauge_new_map = {
214 .scan = rc5_hauppauge_new, 220 .scan = rc5_hauppauge_new,
215 .size = ARRAY_SIZE(rc5_hauppauge_new), 221 .size = ARRAY_SIZE(rc5_hauppauge_new),
216 .rc_type = RC_TYPE_RC5, 222 .rc_type = RC_TYPE_RC5,
217 .name = RC_MAP_RC5_HAUPPAUGE_NEW, 223 .name = RC_MAP_HAUPPAUGE,
218 } 224 }
219}; 225};
220 226
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index e4f8eac7f71..eedefce86fc 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -186,7 +186,7 @@ static const struct mceusb_model mceusb_model[] = {
186 * remotes, but we should have something handy, 186 * remotes, but we should have something handy,
187 * to allow testing it 187 * to allow testing it
188 */ 188 */
189 .rc_map = RC_MAP_RC5_HAUPPAUGE_NEW, 189 .rc_map = RC_MAP_HAUPPAUGE,
190 .name = "Conexant Hybrid TV (cx231xx) MCE IR", 190 .name = "Conexant Hybrid TV (cx231xx) MCE IR",
191 }, 191 },
192 [CX_HYBRID_TV] = { 192 [CX_HYBRID_TV] = {
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index 199b9964bbe..e97cafd8398 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -264,7 +264,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
264 driver_type = RC_DRIVER_IR_RAW; 264 driver_type = RC_DRIVER_IR_RAW;
265 allowed_protos = RC_TYPE_ALL; 265 allowed_protos = RC_TYPE_ALL;
266 /* The grey Hauppauge RC-5 remote */ 266 /* The grey Hauppauge RC-5 remote */
267 rc_map = RC_MAP_RC5_HAUPPAUGE_NEW; 267 rc_map = RC_MAP_HAUPPAUGE;
268 break; 268 break;
269 case CX23885_BOARD_TEVII_S470: 269 case CX23885_BOARD_TEVII_S470:
270 /* Integrated CX23885 IR controller */ 270 /* Integrated CX23885 IR controller */
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 87f77a34eea..aa4f45e692e 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -911,7 +911,7 @@ struct em28xx_board em28xx_boards[] = {
911 .mts_firmware = 1, 911 .mts_firmware = 1,
912 .has_dvb = 1, 912 .has_dvb = 1,
913 .dvb_gpio = hauppauge_wintv_hvr_900_digital, 913 .dvb_gpio = hauppauge_wintv_hvr_900_digital,
914 .ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW, 914 .ir_codes = RC_MAP_HAUPPAUGE,
915 .decoder = EM28XX_TVP5150, 915 .decoder = EM28XX_TVP5150,
916 .input = { { 916 .input = { {
917 .type = EM28XX_VMUX_TELEVISION, 917 .type = EM28XX_VMUX_TELEVISION,
@@ -2430,7 +2430,7 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
2430 dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)"; 2430 dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
2431 break; 2431 break;
2432 case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: 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 dev->init_data.get_key = em28xx_get_key_em_haup; 2434 dev->init_data.get_key = em28xx_get_key_em_haup;
2435 dev->init_data.name = "i2c IR (EM2840 Hauppauge)"; 2435 dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
2436 break; 2436 break;
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index d843afc7c9e..9184751f19c 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -94,7 +94,7 @@ void rc_map_init(void);
94#define RC_MAP_GADMEI_RM008Z "rc-gadmei-rm008z" 94#define RC_MAP_GADMEI_RM008Z "rc-gadmei-rm008z"
95#define RC_MAP_GENIUS_TVGO_A11MCE "rc-genius-tvgo-a11mce" 95#define RC_MAP_GENIUS_TVGO_A11MCE "rc-genius-tvgo-a11mce"
96#define RC_MAP_GOTVIEW7135 "rc-gotview7135" 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#define RC_MAP_IMON_MCE "rc-imon-mce" 98#define RC_MAP_IMON_MCE "rc-imon-mce"
99#define RC_MAP_IMON_PAD "rc-imon-pad" 99#define RC_MAP_IMON_PAD "rc-imon-pad"
100#define RC_MAP_IODATA_BCTV7E "rc-iodata-bctv7e" 100#define RC_MAP_IODATA_BCTV7E "rc-iodata-bctv7e"
@@ -125,7 +125,7 @@ void rc_map_init(void);
125#define RC_MAP_PROTEUS_2309 "rc-proteus-2309" 125#define RC_MAP_PROTEUS_2309 "rc-proteus-2309"
126#define RC_MAP_PURPLETV "rc-purpletv" 126#define RC_MAP_PURPLETV "rc-purpletv"
127#define RC_MAP_PV951 "rc-pv951" 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#define RC_MAP_RC5_TV "rc-rc5-tv" 129#define RC_MAP_RC5_TV "rc-rc5-tv"
130#define RC_MAP_RC6_MCE "rc-rc6-mce" 130#define RC_MAP_RC6_MCE "rc-rc6-mce"
131#define RC_MAP_REAL_AUDIO_220_32_KEYS "rc-real-audio-220-32-keys" 131#define RC_MAP_REAL_AUDIO_220_32_KEYS "rc-real-audio-220-32-keys"