aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/rc/keymaps/Makefile1
-rw-r--r--drivers/media/rc/keymaps/rc-rc5-tv.c81
-rw-r--r--drivers/media/video/ir-kbd-i2c.c16
-rw-r--r--drivers/media/video/ivtv/ivtv-i2c.c3
4 files changed, 3 insertions, 98 deletions
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index 2fb566bf8ea..85cac7ddbce 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -68,7 +68,6 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
68 rc-purpletv.o \ 68 rc-purpletv.o \
69 rc-pv951.o \ 69 rc-pv951.o \
70 rc-hauppauge.o \ 70 rc-hauppauge.o \
71 rc-rc5-tv.o \
72 rc-rc6-mce.o \ 71 rc-rc6-mce.o \
73 rc-real-audio-220-32-keys.o \ 72 rc-real-audio-220-32-keys.o \
74 rc-streamzap.o \ 73 rc-streamzap.o \
diff --git a/drivers/media/rc/keymaps/rc-rc5-tv.c b/drivers/media/rc/keymaps/rc-rc5-tv.c
deleted file mode 100644
index 4fcef9f1f72..00000000000
--- a/drivers/media/rc/keymaps/rc-rc5-tv.c
+++ /dev/null
@@ -1,81 +0,0 @@
1/* rc5-tv.h - Keytable for rc5_tv 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/* generic RC5 keytable */
16/* see http://users.pandora.be/nenya/electronics/rc5/codes00.htm */
17/* used by old (black) Hauppauge remotes */
18
19static struct rc_map_table rc5_tv[] = {
20 /* Keys 0 to 9 */
21 { 0x00, KEY_0 },
22 { 0x01, KEY_1 },
23 { 0x02, KEY_2 },
24 { 0x03, KEY_3 },
25 { 0x04, KEY_4 },
26 { 0x05, KEY_5 },
27 { 0x06, KEY_6 },
28 { 0x07, KEY_7 },
29 { 0x08, KEY_8 },
30 { 0x09, KEY_9 },
31
32 { 0x0b, KEY_CHANNEL }, /* channel / program (japan: 11) */
33 { 0x0c, KEY_POWER }, /* standby */
34 { 0x0d, KEY_MUTE }, /* mute / demute */
35 { 0x0f, KEY_TV }, /* display */
36 { 0x10, KEY_VOLUMEUP },
37 { 0x11, KEY_VOLUMEDOWN },
38 { 0x12, KEY_BRIGHTNESSUP },
39 { 0x13, KEY_BRIGHTNESSDOWN },
40 { 0x1e, KEY_SEARCH }, /* search + */
41 { 0x20, KEY_CHANNELUP }, /* channel / program + */
42 { 0x21, KEY_CHANNELDOWN }, /* channel / program - */
43 { 0x22, KEY_CHANNEL }, /* alt / channel */
44 { 0x23, KEY_LANGUAGE }, /* 1st / 2nd language */
45 { 0x26, KEY_SLEEP }, /* sleeptimer */
46 { 0x2e, KEY_MENU }, /* 2nd controls (USA: menu) */
47 { 0x30, KEY_PAUSE },
48 { 0x32, KEY_REWIND },
49 { 0x33, KEY_GOTO },
50 { 0x35, KEY_PLAY },
51 { 0x36, KEY_STOP },
52 { 0x37, KEY_RECORD }, /* recording */
53 { 0x3c, KEY_TEXT }, /* teletext submode (Japan: 12) */
54 { 0x3d, KEY_SUSPEND }, /* system standby */
55
56};
57
58static struct rc_map_list rc5_tv_map = {
59 .map = {
60 .scan = rc5_tv,
61 .size = ARRAY_SIZE(rc5_tv),
62 .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
63 .name = RC_MAP_RC5_TV,
64 }
65};
66
67static int __init init_rc_map_rc5_tv(void)
68{
69 return rc_map_register(&rc5_tv_map);
70}
71
72static void __exit exit_rc_map_rc5_tv(void)
73{
74 rc_map_unregister(&rc5_tv_map);
75}
76
77module_init(init_rc_map_rc5_tv)
78module_exit(exit_rc_map_rc5_tv)
79
80MODULE_LICENSE("GPL");
81MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index be7064fcdfe..672935f7aeb 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -55,10 +55,6 @@
55static int debug; 55static int debug;
56module_param(debug, int, 0644); /* debug level (0,1,2) */ 56module_param(debug, int, 0644); /* debug level (0,1,2) */
57 57
58static int hauppauge;
59module_param(hauppauge, int, 0644); /* Choose Hauppauge remote */
60MODULE_PARM_DESC(hauppauge, "Specify Hauppauge remote: 0=black, 1=grey (defaults to 0)");
61
62 58
63#define MODULE_NAME "ir-kbd-i2c" 59#define MODULE_NAME "ir-kbd-i2c"
64#define dprintk(level, fmt, arg...) if (debug >= level) \ 60#define dprintk(level, fmt, arg...) if (debug >= level) \
@@ -105,10 +101,6 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
105 /* invalid key press */ 101 /* invalid key press */
106 return 0; 102 return 0;
107 103
108 if (dev!=0x1e && dev!=0x1f)
109 /* not a hauppauge remote */
110 return 0;
111
112 if (!range) 104 if (!range)
113 code += 64; 105 code += 64;
114 106
@@ -312,11 +304,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
312 name = "Hauppauge"; 304 name = "Hauppauge";
313 ir->get_key = get_key_haup; 305 ir->get_key = get_key_haup;
314 rc_type = RC_TYPE_RC5; 306 rc_type = RC_TYPE_RC5;
315 if (hauppauge == 1) { 307 ir_codes = RC_MAP_HAUPPAUGE;
316 ir_codes = RC_MAP_HAUPPAUGE;
317 } else {
318 ir_codes = RC_MAP_RC5_TV;
319 }
320 break; 308 break;
321 case 0x30: 309 case 0x30:
322 name = "KNC One"; 310 name = "KNC One";
@@ -340,7 +328,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
340 name = "Hauppauge/Zilog Z8"; 328 name = "Hauppauge/Zilog Z8";
341 ir->get_key = get_key_haup_xvr; 329 ir->get_key = get_key_haup_xvr;
342 rc_type = RC_TYPE_RC5; 330 rc_type = RC_TYPE_RC5;
343 ir_codes = hauppauge ? RC_MAP_HAUPPAUGE : RC_MAP_RC5_TV; 331 ir_codes = RC_MAP_HAUPPAUGE;
344 break; 332 break;
345 } 333 }
346 334
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index 3c89d6f28d5..d47f41a0ef6 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -205,8 +205,7 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr)
205 break; 205 break;
206 case IVTV_HW_I2C_IR_RX_HAUP_EXT: 206 case IVTV_HW_I2C_IR_RX_HAUP_EXT:
207 case IVTV_HW_I2C_IR_RX_HAUP_INT: 207 case IVTV_HW_I2C_IR_RX_HAUP_INT:
208 /* Default to old black remote */ 208 init_data->ir_codes = RC_MAP_HAUPPAUGE;
209 init_data->ir_codes = RC_MAP_RC5_TV;
210 init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP; 209 init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP;
211 init_data->type = RC_TYPE_RC5; 210 init_data->type = RC_TYPE_RC5;
212 init_data->name = itv->card_name; 211 init_data->name = itv->card_name;