aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-04-02 19:11:45 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:56:51 -0400
commitbd7261d3d7dfe61e8bf8945051c1905ba4dba3b5 (patch)
treeb2a8af995e809da87f04b9a783593f936cf29952
parent02858eedcb78a664215b918d98cdb753ce432ce6 (diff)
V4L/DVB: ir-common: remove keymap tables from the module
Now that the remote keymaps were broken into separate modules, get rid of the keycode tables that were hardcoded into ir-common. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/IR/Makefile2
-rw-r--r--drivers/media/IR/ir-keymaps.c45
-rw-r--r--include/media/ir-common.h65
-rw-r--r--include/media/ir-core.h18
-rw-r--r--include/media/keycodes/adstech-dvb-t-pci.h65
-rw-r--r--include/media/keycodes/apac-viewcomp.h56
-rw-r--r--include/media/keycodes/asus-pc39.h67
-rw-r--r--include/media/keycodes/ati-tv-wonder-hd-600.h45
-rw-r--r--include/media/keycodes/avermedia-a16d.h52
-rw-r--r--include/media/keycodes/avermedia-cardbus.h73
-rw-r--r--include/media/keycodes/avermedia-dvbt.h54
-rw-r--r--include/media/keycodes/avermedia-m135a-rm-jx.h66
-rw-r--r--include/media/keycodes/avermedia.h62
-rw-r--r--include/media/keycodes/avertv-303.h61
-rw-r--r--include/media/keycodes/behold-columbus.h84
-rw-r--r--include/media/keycodes/behold.h117
-rw-r--r--include/media/keycodes/budget-ci-old.h68
-rw-r--r--include/media/keycodes/cinergy-1400.h60
-rw-r--r--include/media/keycodes/cinergy.h55
-rw-r--r--include/media/keycodes/dm1105-nec.h52
-rw-r--r--include/media/keycodes/dntv-live-dvb-t.h54
-rw-r--r--include/media/keycodes/dntv-live-dvbt-pro.h73
-rw-r--r--include/media/keycodes/em-terratec.h46
-rw-r--r--include/media/keycodes/empty.h20
-rw-r--r--include/media/keycodes/encore-enltv-fm53.h57
-rw-r--r--include/media/keycodes/encore-enltv.h88
-rw-r--r--include/media/keycodes/encore-enltv2.h66
-rw-r--r--include/media/keycodes/evga-indtube.h37
-rw-r--r--include/media/keycodes/eztv.h72
-rw-r--r--include/media/keycodes/flydvb.h54
-rw-r--r--include/media/keycodes/flyvideo.h47
-rw-r--r--include/media/keycodes/fusionhdtv-mce.h74
-rw-r--r--include/media/keycodes/gadmei-rm008z.h57
-rw-r--r--include/media/keycodes/genius-tvgo-a11mce.h60
-rw-r--r--include/media/keycodes/gotview7135.h55
-rw-r--r--include/media/keycodes/hauppauge-new.h76
-rw-r--r--include/media/keycodes/iodata-bctv7e.h64
-rw-r--r--include/media/keycodes/kaiomy.h63
-rw-r--r--include/media/keycodes/kworld-315u.h59
-rw-r--r--include/media/keycodes/kworld-plus-tv-analog.h75
-rw-r--r--include/media/keycodes/manli.h111
-rw-r--r--include/media/keycodes/msi-tvanywhere-plus.h100
-rw-r--r--include/media/keycodes/msi-tvanywhere.h44
-rw-r--r--include/media/keycodes/nebula.h73
-rw-r--r--include/media/keycodes/nec-terratec-cinergy-xs.h81
-rw-r--r--include/media/keycodes/norwood.h61
-rw-r--r--include/media/keycodes/npgtech.h57
-rw-r--r--include/media/keycodes/pctv-sedna.h56
-rw-r--r--include/media/keycodes/pinnacle-color.h71
-rw-r--r--include/media/keycodes/pinnacle-grey.h66
-rw-r--r--include/media/keycodes/pinnacle-pctv-hd.h49
-rw-r--r--include/media/keycodes/pixelview-new.h59
-rw-r--r--include/media/keycodes/pixelview.h59
-rw-r--r--include/media/keycodes/powercolor-real-angel.h57
-rw-r--r--include/media/keycodes/proteus-2309.h45
-rw-r--r--include/media/keycodes/purpletv.h58
-rw-r--r--include/media/keycodes/pv951.h54
-rw-r--r--include/media/keycodes/rc5-hauppauge-new.h79
-rw-r--r--include/media/keycodes/rc5-tv.h57
-rw-r--r--include/media/keycodes/real-audio-220-32-keys.h54
-rw-r--r--include/media/keycodes/tbs-nec.h50
-rw-r--r--include/media/keycodes/terratec-cinergy-xs.h68
-rw-r--r--include/media/keycodes/tevii-nec.h65
-rw-r--r--include/media/keycodes/tt-1500.h58
-rw-r--r--include/media/keycodes/videomate-s350.h62
-rw-r--r--include/media/keycodes/videomate-tv-pvr.h64
-rw-r--r--include/media/keycodes/winfast-usbii-deluxe.h58
-rw-r--r--include/media/keycodes/winfast.h78
68 files changed, 1 insertions, 4157 deletions
diff --git a/drivers/media/IR/Makefile b/drivers/media/IR/Makefile
index 3d8dd306df4..0e3f912054c 100644
--- a/drivers/media/IR/Makefile
+++ b/drivers/media/IR/Makefile
@@ -1,4 +1,4 @@
1ir-common-objs := ir-functions.o ir-keymaps.o 1ir-common-objs := ir-functions.o
2ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o 2ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o
3 3
4obj-y += keymaps/ 4obj-y += keymaps/
diff --git a/drivers/media/IR/ir-keymaps.c b/drivers/media/IR/ir-keymaps.c
deleted file mode 100644
index eb255319278..00000000000
--- a/drivers/media/IR/ir-keymaps.c
+++ /dev/null
@@ -1,45 +0,0 @@
1/*
2 Keytables for supported remote controls, used on drivers/media
3 devices.
4
5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version.
9
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
14
15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18*/
19
20#define IR_KEYMAPS
21
22/*
23 * NOTICE FOR DEVELOPERS:
24 * The IR mappings should be as close as possible to what's
25 * specified at:
26 * http://linuxtv.org/wiki/index.php/Remote_Controllers
27 *
28 * The usage of tables with just the command part is deprecated.
29 * All new IR keytables should contain address+command and need
30 * to define the proper IR_TYPE (IR_TYPE_RC5/IR_TYPE_NEC).
31 * The deprecated tables should use IR_TYPE_UNKNOWN
32 */
33#include <linux/module.h>
34
35#include <linux/input.h>
36#include <media/ir-common.h>
37
38/*
39 * All keytables got moved to include/media/keytables directory.
40 * This file is still needed - at least for now, as their data is
41 * dynamically inserted here by the media/ir-common.h, due to the
42 * #define IR_KEYMAPS line, at the beginning of this file. The
43 * plans are to get rid of this file completely in a near future.
44 */
45
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 59ce30280b7..528050e39ad 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -28,71 +28,6 @@
28#include <linux/interrupt.h> 28#include <linux/interrupt.h>
29#include <media/ir-core.h> 29#include <media/ir-core.h>
30 30
31#include <media/keycodes/adstech-dvb-t-pci.h>
32#include <media/keycodes/apac-viewcomp.h>
33#include <media/keycodes/asus-pc39.h>
34#include <media/keycodes/ati-tv-wonder-hd-600.h>
35#include <media/keycodes/avermedia-a16d.h>
36#include <media/keycodes/avermedia-cardbus.h>
37#include <media/keycodes/avermedia-dvbt.h>
38#include <media/keycodes/avermedia.h>
39#include <media/keycodes/avermedia-m135a-rm-jx.h>
40#include <media/keycodes/avertv-303.h>
41#include <media/keycodes/behold-columbus.h>
42#include <media/keycodes/behold.h>
43#include <media/keycodes/budget-ci-old.h>
44#include <media/keycodes/cinergy-1400.h>
45#include <media/keycodes/cinergy.h>
46#include <media/keycodes/dm1105-nec.h>
47#include <media/keycodes/dntv-live-dvb-t.h>
48#include <media/keycodes/dntv-live-dvbt-pro.h>
49#include <media/keycodes/empty.h>
50#include <media/keycodes/em-terratec.h>
51#include <media/keycodes/encore-enltv2.h>
52#include <media/keycodes/encore-enltv-fm53.h>
53#include <media/keycodes/encore-enltv.h>
54#include <media/keycodes/evga-indtube.h>
55#include <media/keycodes/eztv.h>
56#include <media/keycodes/flydvb.h>
57#include <media/keycodes/flyvideo.h>
58#include <media/keycodes/fusionhdtv-mce.h>
59#include <media/keycodes/gadmei-rm008z.h>
60#include <media/keycodes/genius-tvgo-a11mce.h>
61#include <media/keycodes/gotview7135.h>
62#include <media/keycodes/hauppauge-new.h>
63#include <media/keycodes/iodata-bctv7e.h>
64#include <media/keycodes/kaiomy.h>
65#include <media/keycodes/kworld-315u.h>
66#include <media/keycodes/kworld-plus-tv-analog.h>
67#include <media/keycodes/manli.h>
68#include <media/keycodes/msi-tvanywhere.h>
69#include <media/keycodes/msi-tvanywhere-plus.h>
70#include <media/keycodes/nebula.h>
71#include <media/keycodes/nec-terratec-cinergy-xs.h>
72#include <media/keycodes/norwood.h>
73#include <media/keycodes/npgtech.h>
74#include <media/keycodes/pctv-sedna.h>
75#include <media/keycodes/pinnacle-color.h>
76#include <media/keycodes/pinnacle-grey.h>
77#include <media/keycodes/pinnacle-pctv-hd.h>
78#include <media/keycodes/pixelview.h>
79#include <media/keycodes/pixelview-new.h>
80#include <media/keycodes/powercolor-real-angel.h>
81#include <media/keycodes/proteus-2309.h>
82#include <media/keycodes/purpletv.h>
83#include <media/keycodes/pv951.h>
84#include <media/keycodes/rc5-hauppauge-new.h>
85#include <media/keycodes/rc5-tv.h>
86#include <media/keycodes/real-audio-220-32-keys.h>
87#include <media/keycodes/tbs-nec.h>
88#include <media/keycodes/terratec-cinergy-xs.h>
89#include <media/keycodes/tevii-nec.h>
90#include <media/keycodes/tt-1500.h>
91#include <media/keycodes/videomate-s350.h>
92#include <media/keycodes/videomate-tv-pvr.h>
93#include <media/keycodes/winfast.h>
94#include <media/keycodes/winfast-usbii-deluxe.h>
95
96#define RC5_START(x) (((x)>>12)&3) 31#define RC5_START(x) (((x)>>12)&3)
97#define RC5_TOGGLE(x) (((x)>>11)&1) 32#define RC5_TOGGLE(x) (((x)>>11)&1)
98#define RC5_ADDR(x) (((x)>>6)&31) 33#define RC5_ADDR(x) (((x)>>6)&31)
diff --git a/include/media/ir-core.h b/include/media/ir-core.h
index e1772b8230c..c6b8e179dfe 100644
--- a/include/media/ir-core.h
+++ b/include/media/ir-core.h
@@ -102,24 +102,6 @@ struct ir_raw_handler {
102 102
103#define to_ir_input_dev(_attr) container_of(_attr, struct ir_input_dev, attr) 103#define to_ir_input_dev(_attr) container_of(_attr, struct ir_input_dev, attr)
104 104
105#define IR_KEYTABLE(a) \
106ir_codes_ ## a ## _table
107
108#define DECLARE_IR_KEYTABLE(a) \
109extern struct ir_scancode_table IR_KEYTABLE(a)
110
111#define DEFINE_IR_KEYTABLE(tabname, type) \
112struct ir_scancode_table IR_KEYTABLE(tabname) = { \
113 .scan = tabname, \
114 .size = ARRAY_SIZE(tabname), \
115 .ir_type = type, \
116 .name = #tabname, \
117}; \
118EXPORT_SYMBOL_GPL(IR_KEYTABLE(tabname))
119
120#define DEFINE_LEGACY_IR_KEYTABLE(tabname) \
121 DEFINE_IR_KEYTABLE(tabname, IR_TYPE_UNKNOWN)
122
123/* Routines from rc-map.c */ 105/* Routines from rc-map.c */
124 106
125int ir_register_map(struct rc_keymap *map); 107int ir_register_map(struct rc_keymap *map);
diff --git a/include/media/keycodes/adstech-dvb-t-pci.h b/include/media/keycodes/adstech-dvb-t-pci.h
deleted file mode 100644
index cfca5262d43..00000000000
--- a/include/media/keycodes/adstech-dvb-t-pci.h
+++ /dev/null
@@ -1,65 +0,0 @@
1/* adstech-dvb-t-pci.h - Keytable for adstech_dvb_t_pci Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* ADS Tech Instant TV DVB-T PCI Remote */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode adstech_dvb_t_pci[] = {
15 /* Keys 0 to 9 */
16 { 0x4d, KEY_0 },
17 { 0x57, KEY_1 },
18 { 0x4f, KEY_2 },
19 { 0x53, KEY_3 },
20 { 0x56, KEY_4 },
21 { 0x4e, KEY_5 },
22 { 0x5e, KEY_6 },
23 { 0x54, KEY_7 },
24 { 0x4c, KEY_8 },
25 { 0x5c, KEY_9 },
26
27 { 0x5b, KEY_POWER },
28 { 0x5f, KEY_MUTE },
29 { 0x55, KEY_GOTO },
30 { 0x5d, KEY_SEARCH },
31 { 0x17, KEY_EPG }, /* Guide */
32 { 0x1f, KEY_MENU },
33 { 0x0f, KEY_UP },
34 { 0x46, KEY_DOWN },
35 { 0x16, KEY_LEFT },
36 { 0x1e, KEY_RIGHT },
37 { 0x0e, KEY_SELECT }, /* Enter */
38 { 0x5a, KEY_INFO },
39 { 0x52, KEY_EXIT },
40 { 0x59, KEY_PREVIOUS },
41 { 0x51, KEY_NEXT },
42 { 0x58, KEY_REWIND },
43 { 0x50, KEY_FORWARD },
44 { 0x44, KEY_PLAYPAUSE },
45 { 0x07, KEY_STOP },
46 { 0x1b, KEY_RECORD },
47 { 0x13, KEY_TUNER }, /* Live */
48 { 0x0a, KEY_A },
49 { 0x12, KEY_B },
50 { 0x03, KEY_PROG1 }, /* 1 */
51 { 0x01, KEY_PROG2 }, /* 2 */
52 { 0x00, KEY_PROG3 }, /* 3 */
53 { 0x06, KEY_DVD },
54 { 0x48, KEY_AUX }, /* Photo */
55 { 0x40, KEY_VIDEO },
56 { 0x19, KEY_AUDIO }, /* Music */
57 { 0x0b, KEY_CHANNELUP },
58 { 0x08, KEY_CHANNELDOWN },
59 { 0x15, KEY_VOLUMEUP },
60 { 0x1c, KEY_VOLUMEDOWN },
61};
62DEFINE_LEGACY_IR_KEYTABLE(adstech_dvb_t_pci);
63#else
64DECLARE_IR_KEYTABLE(adstech_dvb_t_pci);
65#endif
diff --git a/include/media/keycodes/apac-viewcomp.h b/include/media/keycodes/apac-viewcomp.h
deleted file mode 100644
index 69460c2266e..00000000000
--- a/include/media/keycodes/apac-viewcomp.h
+++ /dev/null
@@ -1,56 +0,0 @@
1/* apac-viewcomp.h - Keytable for apac_viewcomp Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Attila Kondoros <attila.kondoros@chello.hu> */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode apac_viewcomp[] = {
15
16 { 0x01, KEY_1 },
17 { 0x02, KEY_2 },
18 { 0x03, KEY_3 },
19 { 0x04, KEY_4 },
20 { 0x05, KEY_5 },
21 { 0x06, KEY_6 },
22 { 0x07, KEY_7 },
23 { 0x08, KEY_8 },
24 { 0x09, KEY_9 },
25 { 0x00, KEY_0 },
26 { 0x17, KEY_LAST }, /* +100 */
27 { 0x0a, KEY_LIST }, /* recall */
28
29
30 { 0x1c, KEY_TUNER }, /* TV/FM */
31 { 0x15, KEY_SEARCH }, /* scan */
32 { 0x12, KEY_POWER }, /* power */
33 { 0x1f, KEY_VOLUMEDOWN }, /* vol up */
34 { 0x1b, KEY_VOLUMEUP }, /* vol down */
35 { 0x1e, KEY_CHANNELDOWN }, /* chn up */
36 { 0x1a, KEY_CHANNELUP }, /* chn down */
37
38 { 0x11, KEY_VIDEO }, /* video */
39 { 0x0f, KEY_ZOOM }, /* full screen */
40 { 0x13, KEY_MUTE }, /* mute/unmute */
41 { 0x10, KEY_TEXT }, /* min */
42
43 { 0x0d, KEY_STOP }, /* freeze */
44 { 0x0e, KEY_RECORD }, /* record */
45 { 0x1d, KEY_PLAYPAUSE }, /* stop */
46 { 0x19, KEY_PLAY }, /* play */
47
48 { 0x16, KEY_GOTO }, /* osd */
49 { 0x14, KEY_REFRESH }, /* default */
50 { 0x0c, KEY_KPPLUS }, /* fine tune >>>> */
51 { 0x18, KEY_KPMINUS }, /* fine tune <<<< */
52};
53DEFINE_LEGACY_IR_KEYTABLE(apac_viewcomp);
54#else
55DECLARE_IR_KEYTABLE(apac_viewcomp);
56#endif
diff --git a/include/media/keycodes/asus-pc39.h b/include/media/keycodes/asus-pc39.h
deleted file mode 100644
index 3e89ccd4089..00000000000
--- a/include/media/keycodes/asus-pc39.h
+++ /dev/null
@@ -1,67 +0,0 @@
1/* asus-pc39.h - Keytable for asus_pc39 Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/*
12 * Marc Fargas <telenieko@telenieko.com>
13 * this is the remote control that comes with the asus p7131
14 * which has a label saying is "Model PC-39"
15 */
16
17#ifdef IR_KEYMAPS
18static struct ir_scancode asus_pc39[] = {
19 /* Keys 0 to 9 */
20 { 0x15, KEY_0 },
21 { 0x29, KEY_1 },
22 { 0x2d, KEY_2 },
23 { 0x2b, KEY_3 },
24 { 0x09, KEY_4 },
25 { 0x0d, KEY_5 },
26 { 0x0b, KEY_6 },
27 { 0x31, KEY_7 },
28 { 0x35, KEY_8 },
29 { 0x33, KEY_9 },
30
31 { 0x3e, KEY_RADIO }, /* radio */
32 { 0x03, KEY_MENU }, /* dvd/menu */
33 { 0x2a, KEY_VOLUMEUP },
34 { 0x19, KEY_VOLUMEDOWN },
35 { 0x37, KEY_UP },
36 { 0x3b, KEY_DOWN },
37 { 0x27, KEY_LEFT },
38 { 0x2f, KEY_RIGHT },
39 { 0x25, KEY_VIDEO }, /* video */
40 { 0x39, KEY_AUDIO }, /* music */
41
42 { 0x21, KEY_TV }, /* tv */
43 { 0x1d, KEY_EXIT }, /* back */
44 { 0x0a, KEY_CHANNELUP }, /* channel / program + */
45 { 0x1b, KEY_CHANNELDOWN }, /* channel / program - */
46 { 0x1a, KEY_ENTER }, /* enter */
47
48 { 0x06, KEY_PAUSE }, /* play/pause */
49 { 0x1e, KEY_PREVIOUS }, /* rew */
50 { 0x26, KEY_NEXT }, /* forward */
51 { 0x0e, KEY_REWIND }, /* backward << */
52 { 0x3a, KEY_FASTFORWARD }, /* forward >> */
53 { 0x36, KEY_STOP },
54 { 0x2e, KEY_RECORD }, /* recording */
55 { 0x16, KEY_POWER }, /* the button that reads "close" */
56
57 { 0x11, KEY_ZOOM }, /* full screen */
58 { 0x13, KEY_MACRO }, /* recall */
59 { 0x23, KEY_HOME }, /* home */
60 { 0x05, KEY_PVR }, /* picture */
61 { 0x3d, KEY_MUTE }, /* mute */
62 { 0x01, KEY_DVD }, /* dvd */
63};
64DEFINE_LEGACY_IR_KEYTABLE(asus_pc39);
65#else
66DECLARE_IR_KEYTABLE(asus_pc39);
67#endif
diff --git a/include/media/keycodes/ati-tv-wonder-hd-600.h b/include/media/keycodes/ati-tv-wonder-hd-600.h
deleted file mode 100644
index 25db7bfcc1a..00000000000
--- a/include/media/keycodes/ati-tv-wonder-hd-600.h
+++ /dev/null
@@ -1,45 +0,0 @@
1/* ati-tv-wonder-hd-600.h - Keytable for ati_tv_wonder_hd_600 Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* ATI TV Wonder HD 600 USB
12 Devin Heitmueller <devin.heitmueller@gmail.com>
13 */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode ati_tv_wonder_hd_600[] = {
17 { 0x00, KEY_RECORD}, /* Row 1 */
18 { 0x01, KEY_PLAYPAUSE},
19 { 0x02, KEY_STOP},
20 { 0x03, KEY_POWER},
21 { 0x04, KEY_PREVIOUS}, /* Row 2 */
22 { 0x05, KEY_REWIND},
23 { 0x06, KEY_FORWARD},
24 { 0x07, KEY_NEXT},
25 { 0x08, KEY_EPG}, /* Row 3 */
26 { 0x09, KEY_HOME},
27 { 0x0a, KEY_MENU},
28 { 0x0b, KEY_CHANNELUP},
29 { 0x0c, KEY_BACK}, /* Row 4 */
30 { 0x0d, KEY_UP},
31 { 0x0e, KEY_INFO},
32 { 0x0f, KEY_CHANNELDOWN},
33 { 0x10, KEY_LEFT}, /* Row 5 */
34 { 0x11, KEY_SELECT},
35 { 0x12, KEY_RIGHT},
36 { 0x13, KEY_VOLUMEUP},
37 { 0x14, KEY_LAST}, /* Row 6 */
38 { 0x15, KEY_DOWN},
39 { 0x16, KEY_MUTE},
40 { 0x17, KEY_VOLUMEDOWN},
41};
42DEFINE_LEGACY_IR_KEYTABLE(ati_tv_wonder_hd_600);
43#else
44DECLARE_IR_KEYTABLE(ati_tv_wonder_hd_600);
45#endif
diff --git a/include/media/keycodes/avermedia-a16d.h b/include/media/keycodes/avermedia-a16d.h
deleted file mode 100644
index d267951665d..00000000000
--- a/include/media/keycodes/avermedia-a16d.h
+++ /dev/null
@@ -1,52 +0,0 @@
1/* avermedia-a16d.h - Keytable for avermedia_a16d Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode avermedia_a16d[] = {
14 { 0x20, KEY_LIST},
15 { 0x00, KEY_POWER},
16 { 0x28, KEY_1},
17 { 0x18, KEY_2},
18 { 0x38, KEY_3},
19 { 0x24, KEY_4},
20 { 0x14, KEY_5},
21 { 0x34, KEY_6},
22 { 0x2c, KEY_7},
23 { 0x1c, KEY_8},
24 { 0x3c, KEY_9},
25 { 0x12, KEY_SUBTITLE},
26 { 0x22, KEY_0},
27 { 0x32, KEY_REWIND},
28 { 0x3a, KEY_SHUFFLE},
29 { 0x02, KEY_PRINT},
30 { 0x11, KEY_CHANNELDOWN},
31 { 0x31, KEY_CHANNELUP},
32 { 0x0c, KEY_ZOOM},
33 { 0x1e, KEY_VOLUMEDOWN},
34 { 0x3e, KEY_VOLUMEUP},
35 { 0x0a, KEY_MUTE},
36 { 0x04, KEY_AUDIO},
37 { 0x26, KEY_RECORD},
38 { 0x06, KEY_PLAY},
39 { 0x36, KEY_STOP},
40 { 0x16, KEY_PAUSE},
41 { 0x2e, KEY_REWIND},
42 { 0x0e, KEY_FASTFORWARD},
43 { 0x30, KEY_TEXT},
44 { 0x21, KEY_GREEN},
45 { 0x01, KEY_BLUE},
46 { 0x08, KEY_EPG},
47 { 0x2a, KEY_MENU},
48};
49DEFINE_LEGACY_IR_KEYTABLE(avermedia_a16d);
50#else
51DECLARE_IR_KEYTABLE(avermedia_a16d);
52#endif
diff --git a/include/media/keycodes/avermedia-cardbus.h b/include/media/keycodes/avermedia-cardbus.h
deleted file mode 100644
index 221049d1a57..00000000000
--- a/include/media/keycodes/avermedia-cardbus.h
+++ /dev/null
@@ -1,73 +0,0 @@
1/* avermedia-cardbus.h - Keytable for avermedia_cardbus Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Oldrich Jedlicka <oldium.pro@seznam.cz> */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode avermedia_cardbus[] = {
15 { 0x00, KEY_POWER },
16 { 0x01, KEY_TUNER }, /* TV/FM */
17 { 0x03, KEY_TEXT }, /* Teletext */
18 { 0x04, KEY_EPG },
19 { 0x05, KEY_1 },
20 { 0x06, KEY_2 },
21 { 0x07, KEY_3 },
22 { 0x08, KEY_AUDIO },
23 { 0x09, KEY_4 },
24 { 0x0a, KEY_5 },
25 { 0x0b, KEY_6 },
26 { 0x0c, KEY_ZOOM }, /* Full screen */
27 { 0x0d, KEY_7 },
28 { 0x0e, KEY_8 },
29 { 0x0f, KEY_9 },
30 { 0x10, KEY_PAGEUP }, /* 16-CH PREV */
31 { 0x11, KEY_0 },
32 { 0x12, KEY_INFO },
33 { 0x13, KEY_AGAIN }, /* CH RTN - channel return */
34 { 0x14, KEY_MUTE },
35 { 0x15, KEY_EDIT }, /* Autoscan */
36 { 0x17, KEY_SAVE }, /* Screenshot */
37 { 0x18, KEY_PLAYPAUSE },
38 { 0x19, KEY_RECORD },
39 { 0x1a, KEY_PLAY },
40 { 0x1b, KEY_STOP },
41 { 0x1c, KEY_FASTFORWARD },
42 { 0x1d, KEY_REWIND },
43 { 0x1e, KEY_VOLUMEDOWN },
44 { 0x1f, KEY_VOLUMEUP },
45 { 0x22, KEY_SLEEP }, /* Sleep */
46 { 0x23, KEY_ZOOM }, /* Aspect */
47 { 0x26, KEY_SCREEN }, /* Pos */
48 { 0x27, KEY_ANGLE }, /* Size */
49 { 0x28, KEY_SELECT }, /* Select */
50 { 0x29, KEY_BLUE }, /* Blue/Picture */
51 { 0x2a, KEY_BACKSPACE }, /* Back */
52 { 0x2b, KEY_MEDIA }, /* PIP (Picture-in-picture) */
53 { 0x2c, KEY_DOWN },
54 { 0x2e, KEY_DOT },
55 { 0x2f, KEY_TV }, /* Live TV */
56 { 0x32, KEY_LEFT },
57 { 0x33, KEY_CLEAR }, /* Clear */
58 { 0x35, KEY_RED }, /* Red/TV */
59 { 0x36, KEY_UP },
60 { 0x37, KEY_HOME }, /* Home */
61 { 0x39, KEY_GREEN }, /* Green/Video */
62 { 0x3d, KEY_YELLOW }, /* Yellow/Music */
63 { 0x3e, KEY_OK }, /* Ok */
64 { 0x3f, KEY_RIGHT },
65 { 0x40, KEY_NEXT }, /* Next */
66 { 0x41, KEY_PREVIOUS }, /* Previous */
67 { 0x42, KEY_CHANNELDOWN }, /* Channel down */
68 { 0x43, KEY_CHANNELUP }, /* Channel up */
69};
70DEFINE_LEGACY_IR_KEYTABLE(avermedia_cardbus);
71#else
72DECLARE_IR_KEYTABLE(avermedia_cardbus);
73#endif
diff --git a/include/media/keycodes/avermedia-dvbt.h b/include/media/keycodes/avermedia-dvbt.h
deleted file mode 100644
index bdaadf40d2c..00000000000
--- a/include/media/keycodes/avermedia-dvbt.h
+++ /dev/null
@@ -1,54 +0,0 @@
1/* avermedia-dvbt.h - Keytable for avermedia_dvbt Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Matt Jesson <dvb@jesson.eclipse.co.uk */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode avermedia_dvbt[] = {
15 { 0x28, KEY_0 }, /* '0' / 'enter' */
16 { 0x22, KEY_1 }, /* '1' */
17 { 0x12, KEY_2 }, /* '2' / 'up arrow' */
18 { 0x32, KEY_3 }, /* '3' */
19 { 0x24, KEY_4 }, /* '4' / 'left arrow' */
20 { 0x14, KEY_5 }, /* '5' */
21 { 0x34, KEY_6 }, /* '6' / 'right arrow' */
22 { 0x26, KEY_7 }, /* '7' */
23 { 0x16, KEY_8 }, /* '8' / 'down arrow' */
24 { 0x36, KEY_9 }, /* '9' */
25
26 { 0x20, KEY_LIST }, /* 'source' */
27 { 0x10, KEY_TEXT }, /* 'teletext' */
28 { 0x00, KEY_POWER }, /* 'power' */
29 { 0x04, KEY_AUDIO }, /* 'audio' */
30 { 0x06, KEY_ZOOM }, /* 'full screen' */
31 { 0x18, KEY_VIDEO }, /* 'display' */
32 { 0x38, KEY_SEARCH }, /* 'loop' */
33 { 0x08, KEY_INFO }, /* 'preview' */
34 { 0x2a, KEY_REWIND }, /* 'backward <<' */
35 { 0x1a, KEY_FASTFORWARD }, /* 'forward >>' */
36 { 0x3a, KEY_RECORD }, /* 'capture' */
37 { 0x0a, KEY_MUTE }, /* 'mute' */
38 { 0x2c, KEY_RECORD }, /* 'record' */
39 { 0x1c, KEY_PAUSE }, /* 'pause' */
40 { 0x3c, KEY_STOP }, /* 'stop' */
41 { 0x0c, KEY_PLAY }, /* 'play' */
42 { 0x2e, KEY_RED }, /* 'red' */
43 { 0x01, KEY_BLUE }, /* 'blue' / 'cancel' */
44 { 0x0e, KEY_YELLOW }, /* 'yellow' / 'ok' */
45 { 0x21, KEY_GREEN }, /* 'green' */
46 { 0x11, KEY_CHANNELDOWN }, /* 'channel -' */
47 { 0x31, KEY_CHANNELUP }, /* 'channel +' */
48 { 0x1e, KEY_VOLUMEDOWN }, /* 'volume -' */
49 { 0x3e, KEY_VOLUMEUP }, /* 'volume +' */
50};
51DEFINE_LEGACY_IR_KEYTABLE(avermedia_dvbt);
52#else
53DECLARE_IR_KEYTABLE(avermedia_dvbt);
54#endif
diff --git a/include/media/keycodes/avermedia-m135a-rm-jx.h b/include/media/keycodes/avermedia-m135a-rm-jx.h
deleted file mode 100644
index 1158598994c..00000000000
--- a/include/media/keycodes/avermedia-m135a-rm-jx.h
+++ /dev/null
@@ -1,66 +0,0 @@
1/* avermedia-m135a-rm-jx.h - Keytable for avermedia_m135a_rm_jx Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/*
12 * Avermedia M135A with IR model RM-JX
13 * The same codes exist on both Positivo (BR) and original IR
14 * Mauro Carvalho Chehab <mchehab@infradead.org>
15 */
16
17#ifdef IR_KEYMAPS
18static struct ir_scancode avermedia_m135a_rm_jx[] = {
19 { 0x0200, KEY_POWER2 },
20 { 0x022e, KEY_DOT }, /* '.' */
21 { 0x0201, KEY_MODE }, /* TV/FM or SOURCE */
22
23 { 0x0205, KEY_1 },
24 { 0x0206, KEY_2 },
25 { 0x0207, KEY_3 },
26 { 0x0209, KEY_4 },
27 { 0x020a, KEY_5 },
28 { 0x020b, KEY_6 },
29 { 0x020d, KEY_7 },
30 { 0x020e, KEY_8 },
31 { 0x020f, KEY_9 },
32 { 0x0211, KEY_0 },
33
34 { 0x0213, KEY_RIGHT }, /* -> or L */
35 { 0x0212, KEY_LEFT }, /* <- or R */
36
37 { 0x0217, KEY_SLEEP }, /* Capturar Imagem or Snapshot */
38 { 0x0210, KEY_SHUFFLE }, /* Amostra or 16 chan prev */
39
40 { 0x0303, KEY_CHANNELUP },
41 { 0x0302, KEY_CHANNELDOWN },
42 { 0x021f, KEY_VOLUMEUP },
43 { 0x021e, KEY_VOLUMEDOWN },
44 { 0x020c, KEY_ENTER }, /* Full Screen */
45
46 { 0x0214, KEY_MUTE },
47 { 0x0208, KEY_AUDIO },
48
49 { 0x0203, KEY_TEXT }, /* Teletext */
50 { 0x0204, KEY_EPG },
51 { 0x022b, KEY_TV2 }, /* TV2 or PIP */
52
53 { 0x021d, KEY_RED },
54 { 0x021c, KEY_YELLOW },
55 { 0x0301, KEY_GREEN },
56 { 0x0300, KEY_BLUE },
57
58 { 0x021a, KEY_PLAYPAUSE },
59 { 0x0219, KEY_RECORD },
60 { 0x0218, KEY_PLAY },
61 { 0x021b, KEY_STOP },
62};
63DEFINE_IR_KEYTABLE(avermedia_m135a_rm_jx, IR_TYPE_NEC);
64#else
65DECLARE_IR_KEYTABLE(avermedia_m135a_rm_jx);
66#endif
diff --git a/include/media/keycodes/avermedia.h b/include/media/keycodes/avermedia.h
deleted file mode 100644
index a4834528a8e..00000000000
--- a/include/media/keycodes/avermedia.h
+++ /dev/null
@@ -1,62 +0,0 @@
1/* avermedia.h - Keytable for avermedia Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Alex Hermann <gaaf@gmx.net> */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode avermedia[] = {
15 { 0x28, KEY_1 },
16 { 0x18, KEY_2 },
17 { 0x38, KEY_3 },
18 { 0x24, KEY_4 },
19 { 0x14, KEY_5 },
20 { 0x34, KEY_6 },
21 { 0x2c, KEY_7 },
22 { 0x1c, KEY_8 },
23 { 0x3c, KEY_9 },
24 { 0x22, KEY_0 },
25
26 { 0x20, KEY_TV }, /* TV/FM */
27 { 0x10, KEY_CD }, /* CD */
28 { 0x30, KEY_TEXT }, /* TELETEXT */
29 { 0x00, KEY_POWER }, /* POWER */
30
31 { 0x08, KEY_VIDEO }, /* VIDEO */
32 { 0x04, KEY_AUDIO }, /* AUDIO */
33 { 0x0c, KEY_ZOOM }, /* FULL SCREEN */
34
35 { 0x12, KEY_SUBTITLE }, /* DISPLAY */
36 { 0x32, KEY_REWIND }, /* LOOP */
37 { 0x02, KEY_PRINT }, /* PREVIEW */
38
39 { 0x2a, KEY_SEARCH }, /* AUTOSCAN */
40 { 0x1a, KEY_SLEEP }, /* FREEZE */
41 { 0x3a, KEY_CAMERA }, /* SNAPSHOT */
42 { 0x0a, KEY_MUTE }, /* MUTE */
43
44 { 0x26, KEY_RECORD }, /* RECORD */
45 { 0x16, KEY_PAUSE }, /* PAUSE */
46 { 0x36, KEY_STOP }, /* STOP */
47 { 0x06, KEY_PLAY }, /* PLAY */
48
49 { 0x2e, KEY_RED }, /* RED */
50 { 0x21, KEY_GREEN }, /* GREEN */
51 { 0x0e, KEY_YELLOW }, /* YELLOW */
52 { 0x01, KEY_BLUE }, /* BLUE */
53
54 { 0x1e, KEY_VOLUMEDOWN }, /* VOLUME- */
55 { 0x3e, KEY_VOLUMEUP }, /* VOLUME+ */
56 { 0x11, KEY_CHANNELDOWN }, /* CHANNEL/PAGE- */
57 { 0x31, KEY_CHANNELUP } /* CHANNEL/PAGE+ */
58};
59DEFINE_LEGACY_IR_KEYTABLE(avermedia);
60#else
61DECLARE_IR_KEYTABLE(avermedia);
62#endif
diff --git a/include/media/keycodes/avertv-303.h b/include/media/keycodes/avertv-303.h
deleted file mode 100644
index 1ef10af7802..00000000000
--- a/include/media/keycodes/avertv-303.h
+++ /dev/null
@@ -1,61 +0,0 @@
1/* avertv-303.h - Keytable for avertv_303 Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* AVERTV STUDIO 303 Remote */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode avertv_303[] = {
15 { 0x2a, KEY_1 },
16 { 0x32, KEY_2 },
17 { 0x3a, KEY_3 },
18 { 0x4a, KEY_4 },
19 { 0x52, KEY_5 },
20 { 0x5a, KEY_6 },
21 { 0x6a, KEY_7 },
22 { 0x72, KEY_8 },
23 { 0x7a, KEY_9 },
24 { 0x0e, KEY_0 },
25
26 { 0x02, KEY_POWER },
27 { 0x22, KEY_VIDEO },
28 { 0x42, KEY_AUDIO },
29 { 0x62, KEY_ZOOM },
30 { 0x0a, KEY_TV },
31 { 0x12, KEY_CD },
32 { 0x1a, KEY_TEXT },
33
34 { 0x16, KEY_SUBTITLE },
35 { 0x1e, KEY_REWIND },
36 { 0x06, KEY_PRINT },
37
38 { 0x2e, KEY_SEARCH },
39 { 0x36, KEY_SLEEP },
40 { 0x3e, KEY_SHUFFLE },
41 { 0x26, KEY_MUTE },
42
43 { 0x4e, KEY_RECORD },
44 { 0x56, KEY_PAUSE },
45 { 0x5e, KEY_STOP },
46 { 0x46, KEY_PLAY },
47
48 { 0x6e, KEY_RED },
49 { 0x0b, KEY_GREEN },
50 { 0x66, KEY_YELLOW },
51 { 0x03, KEY_BLUE },
52
53 { 0x76, KEY_LEFT },
54 { 0x7e, KEY_RIGHT },
55 { 0x13, KEY_DOWN },
56 { 0x1b, KEY_UP },
57};
58DEFINE_LEGACY_IR_KEYTABLE(avertv_303);
59#else
60DECLARE_IR_KEYTABLE(avertv_303);
61#endif
diff --git a/include/media/keycodes/behold-columbus.h b/include/media/keycodes/behold-columbus.h
deleted file mode 100644
index fb68e75585f..00000000000
--- a/include/media/keycodes/behold-columbus.h
+++ /dev/null
@@ -1,84 +0,0 @@
1/* behold-columbus.h - Keytable for behold_columbus Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Beholder Intl. Ltd. 2008
12 * Dmitry Belimov d.belimov@google.com
13 * Keytable is used by BeholdTV Columbus
14 * The "ascii-art picture" below (in comments, first row
15 * is the keycode in hex, and subsequent row(s) shows
16 * the button labels (several variants when appropriate)
17 * helps to descide which keycodes to assign to the buttons.
18 */
19
20#ifdef IR_KEYMAPS
21static struct ir_scancode behold_columbus[] = {
22
23 /* 0x13 0x11 0x1C 0x12 *
24 * Mute Source TV/FM Power *
25 * */
26
27 { 0x13, KEY_MUTE },
28 { 0x11, KEY_PROPS },
29 { 0x1C, KEY_TUNER }, /* KEY_TV/KEY_RADIO */
30 { 0x12, KEY_POWER },
31
32 /* 0x01 0x02 0x03 0x0D *
33 * 1 2 3 Stereo *
34 * *
35 * 0x04 0x05 0x06 0x19 *
36 * 4 5 6 Snapshot *
37 * *
38 * 0x07 0x08 0x09 0x10 *
39 * 7 8 9 Zoom *
40 * */
41 { 0x01, KEY_1 },
42 { 0x02, KEY_2 },
43 { 0x03, KEY_3 },
44 { 0x0D, KEY_SETUP }, /* Setup key */
45 { 0x04, KEY_4 },
46 { 0x05, KEY_5 },
47 { 0x06, KEY_6 },
48 { 0x19, KEY_CAMERA }, /* Snapshot key */
49 { 0x07, KEY_7 },
50 { 0x08, KEY_8 },
51 { 0x09, KEY_9 },
52 { 0x10, KEY_ZOOM },
53
54 /* 0x0A 0x00 0x0B 0x0C *
55 * RECALL 0 ChannelUp VolumeUp *
56 * */
57 { 0x0A, KEY_AGAIN },
58 { 0x00, KEY_0 },
59 { 0x0B, KEY_CHANNELUP },
60 { 0x0C, KEY_VOLUMEUP },
61
62 /* 0x1B 0x1D 0x15 0x18 *
63 * Timeshift Record ChannelDown VolumeDown *
64 * */
65
66 { 0x1B, KEY_TIME },
67 { 0x1D, KEY_RECORD },
68 { 0x15, KEY_CHANNELDOWN },
69 { 0x18, KEY_VOLUMEDOWN },
70
71 /* 0x0E 0x1E 0x0F 0x1A *
72 * Stop Pause Previouse Next *
73 * */
74
75 { 0x0E, KEY_STOP },
76 { 0x1E, KEY_PAUSE },
77 { 0x0F, KEY_PREVIOUS },
78 { 0x1A, KEY_NEXT },
79
80};
81DEFINE_LEGACY_IR_KEYTABLE(behold_columbus);
82#else
83DECLARE_IR_KEYTABLE(behold_columbus);
84#endif
diff --git a/include/media/keycodes/behold.h b/include/media/keycodes/behold.h
deleted file mode 100644
index 57a2dae49b6..00000000000
--- a/include/media/keycodes/behold.h
+++ /dev/null
@@ -1,117 +0,0 @@
1/* behold.h - Keytable for behold Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/*
12 * Igor Kuznetsov <igk72@ya.ru>
13 * Andrey J. Melnikov <temnota@kmv.ru>
14 *
15 * Keytable is used by BeholdTV 60x series, M6 series at
16 * least, and probably other cards too.
17 * The "ascii-art picture" below (in comments, first row
18 * is the keycode in hex, and subsequent row(s) shows
19 * the button labels (several variants when appropriate)
20 * helps to descide which keycodes to assign to the buttons.
21 */
22
23#ifdef IR_KEYMAPS
24static struct ir_scancode behold[] = {
25
26 /* 0x1c 0x12 *
27 * TV/FM POWER *
28 * */
29 { 0x1c, KEY_TUNER }, /* XXX KEY_TV / KEY_RADIO */
30 { 0x12, KEY_POWER },
31
32 /* 0x01 0x02 0x03 *
33 * 1 2 3 *
34 * *
35 * 0x04 0x05 0x06 *
36 * 4 5 6 *
37 * *
38 * 0x07 0x08 0x09 *
39 * 7 8 9 *
40 * */
41 { 0x01, KEY_1 },
42 { 0x02, KEY_2 },
43 { 0x03, KEY_3 },
44 { 0x04, KEY_4 },
45 { 0x05, KEY_5 },
46 { 0x06, KEY_6 },
47 { 0x07, KEY_7 },
48 { 0x08, KEY_8 },
49 { 0x09, KEY_9 },
50
51 /* 0x0a 0x00 0x17 *
52 * RECALL 0 MODE *
53 * */
54 { 0x0a, KEY_AGAIN },
55 { 0x00, KEY_0 },
56 { 0x17, KEY_MODE },
57
58 /* 0x14 0x10 *
59 * ASPECT FULLSCREEN *
60 * */
61 { 0x14, KEY_SCREEN },
62 { 0x10, KEY_ZOOM },
63
64 /* 0x0b *
65 * Up *
66 * *
67 * 0x18 0x16 0x0c *
68 * Left Ok Right *
69 * *
70 * 0x015 *
71 * Down *
72 * */
73 { 0x0b, KEY_CHANNELUP },
74 { 0x18, KEY_VOLUMEDOWN },
75 { 0x16, KEY_OK }, /* XXX KEY_ENTER */
76 { 0x0c, KEY_VOLUMEUP },
77 { 0x15, KEY_CHANNELDOWN },
78
79 /* 0x11 0x0d *
80 * MUTE INFO *
81 * */
82 { 0x11, KEY_MUTE },
83 { 0x0d, KEY_INFO },
84
85 /* 0x0f 0x1b 0x1a *
86 * RECORD PLAY/PAUSE STOP *
87 * *
88 * 0x0e 0x1f 0x1e *
89 *TELETEXT AUDIO SOURCE *
90 * RED YELLOW *
91 * */
92 { 0x0f, KEY_RECORD },
93 { 0x1b, KEY_PLAYPAUSE },
94 { 0x1a, KEY_STOP },
95 { 0x0e, KEY_TEXT },
96 { 0x1f, KEY_RED }, /*XXX KEY_AUDIO */
97 { 0x1e, KEY_YELLOW }, /*XXX KEY_SOURCE */
98
99 /* 0x1d 0x13 0x19 *
100 * SLEEP PREVIEW DVB *
101 * GREEN BLUE *
102 * */
103 { 0x1d, KEY_SLEEP },
104 { 0x13, KEY_GREEN },
105 { 0x19, KEY_BLUE }, /* XXX KEY_SAT */
106
107 /* 0x58 0x5c *
108 * FREEZE SNAPSHOT *
109 * */
110 { 0x58, KEY_SLOW },
111 { 0x5c, KEY_CAMERA },
112
113};
114DEFINE_LEGACY_IR_KEYTABLE(behold);
115#else
116DECLARE_IR_KEYTABLE(behold);
117#endif
diff --git a/include/media/keycodes/budget-ci-old.h b/include/media/keycodes/budget-ci-old.h
deleted file mode 100644
index 03ada4710cf..00000000000
--- a/include/media/keycodes/budget-ci-old.h
+++ /dev/null
@@ -1,68 +0,0 @@
1/* budget-ci-old.h - Keytable for budget_ci_old Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* From reading the following remotes:
12 * Zenith Universal 7 / TV Mode 807 / VCR Mode 837
13 * Hauppauge (from NOVA-CI-s box product)
14 * This is a "middle of the road" approach, differences are noted
15 */
16
17#ifdef IR_KEYMAPS
18static struct ir_scancode budget_ci_old[] = {
19 { 0x00, KEY_0 },
20 { 0x01, KEY_1 },
21 { 0x02, KEY_2 },
22 { 0x03, KEY_3 },
23 { 0x04, KEY_4 },
24 { 0x05, KEY_5 },
25 { 0x06, KEY_6 },
26 { 0x07, KEY_7 },
27 { 0x08, KEY_8 },
28 { 0x09, KEY_9 },
29 { 0x0a, KEY_ENTER },
30 { 0x0b, KEY_RED },
31 { 0x0c, KEY_POWER }, /* RADIO on Hauppauge */
32 { 0x0d, KEY_MUTE },
33 { 0x0f, KEY_A }, /* TV on Hauppauge */
34 { 0x10, KEY_VOLUMEUP },
35 { 0x11, KEY_VOLUMEDOWN },
36 { 0x14, KEY_B },
37 { 0x1c, KEY_UP },
38 { 0x1d, KEY_DOWN },
39 { 0x1e, KEY_OPTION }, /* RESERVED on Hauppauge */
40 { 0x1f, KEY_BREAK },
41 { 0x20, KEY_CHANNELUP },
42 { 0x21, KEY_CHANNELDOWN },
43 { 0x22, KEY_PREVIOUS }, /* Prev Ch on Zenith, SOURCE on Hauppauge */
44 { 0x24, KEY_RESTART },
45 { 0x25, KEY_OK },
46 { 0x26, KEY_CYCLEWINDOWS }, /* MINIMIZE on Hauppauge */
47 { 0x28, KEY_ENTER }, /* VCR mode on Zenith */
48 { 0x29, KEY_PAUSE },
49 { 0x2b, KEY_RIGHT },
50 { 0x2c, KEY_LEFT },
51 { 0x2e, KEY_MENU }, /* FULL SCREEN on Hauppauge */
52 { 0x30, KEY_SLOW },
53 { 0x31, KEY_PREVIOUS }, /* VCR mode on Zenith */
54 { 0x32, KEY_REWIND },
55 { 0x34, KEY_FASTFORWARD },
56 { 0x35, KEY_PLAY },
57 { 0x36, KEY_STOP },
58 { 0x37, KEY_RECORD },
59 { 0x38, KEY_TUNER }, /* TV/VCR on Zenith */
60 { 0x3a, KEY_C },
61 { 0x3c, KEY_EXIT },
62 { 0x3d, KEY_POWER2 },
63 { 0x3e, KEY_TUNER },
64};
65DEFINE_LEGACY_IR_KEYTABLE(budget_ci_old);
66#else
67DECLARE_IR_KEYTABLE(budget_ci_old);
68#endif
diff --git a/include/media/keycodes/cinergy-1400.h b/include/media/keycodes/cinergy-1400.h
deleted file mode 100644
index 9b562eab771..00000000000
--- a/include/media/keycodes/cinergy-1400.h
+++ /dev/null
@@ -1,60 +0,0 @@
1/* cinergy-1400.h - Keytable for cinergy_1400 Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Cinergy 1400 DVB-T */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode cinergy_1400[] = {
15 { 0x01, KEY_POWER },
16 { 0x02, KEY_1 },
17 { 0x03, KEY_2 },
18 { 0x04, KEY_3 },
19 { 0x05, KEY_4 },
20 { 0x06, KEY_5 },
21 { 0x07, KEY_6 },
22 { 0x08, KEY_7 },
23 { 0x09, KEY_8 },
24 { 0x0a, KEY_9 },
25 { 0x0c, KEY_0 },
26
27 { 0x0b, KEY_VIDEO },
28 { 0x0d, KEY_REFRESH },
29 { 0x0e, KEY_SELECT },
30 { 0x0f, KEY_EPG },
31 { 0x10, KEY_UP },
32 { 0x11, KEY_LEFT },
33 { 0x12, KEY_OK },
34 { 0x13, KEY_RIGHT },
35 { 0x14, KEY_DOWN },
36 { 0x15, KEY_TEXT },
37 { 0x16, KEY_INFO },
38
39 { 0x17, KEY_RED },
40 { 0x18, KEY_GREEN },
41 { 0x19, KEY_YELLOW },
42 { 0x1a, KEY_BLUE },
43
44 { 0x1b, KEY_CHANNELUP },
45 { 0x1c, KEY_VOLUMEUP },
46 { 0x1d, KEY_MUTE },
47 { 0x1e, KEY_VOLUMEDOWN },
48 { 0x1f, KEY_CHANNELDOWN },
49
50 { 0x40, KEY_PAUSE },
51 { 0x4c, KEY_PLAY },
52 { 0x58, KEY_RECORD },
53 { 0x54, KEY_PREVIOUS },
54 { 0x48, KEY_STOP },
55 { 0x5c, KEY_NEXT },
56};
57DEFINE_LEGACY_IR_KEYTABLE(cinergy_1400);
58#else
59DECLARE_IR_KEYTABLE(cinergy_1400);
60#endif
diff --git a/include/media/keycodes/cinergy.h b/include/media/keycodes/cinergy.h
deleted file mode 100644
index 7884696bc68..00000000000
--- a/include/media/keycodes/cinergy.h
+++ /dev/null
@@ -1,55 +0,0 @@
1/* cinergy.h - Keytable for cinergy Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode cinergy[] = {
14 { 0x00, KEY_0 },
15 { 0x01, KEY_1 },
16 { 0x02, KEY_2 },
17 { 0x03, KEY_3 },
18 { 0x04, KEY_4 },
19 { 0x05, KEY_5 },
20 { 0x06, KEY_6 },
21 { 0x07, KEY_7 },
22 { 0x08, KEY_8 },
23 { 0x09, KEY_9 },
24
25 { 0x0a, KEY_POWER },
26 { 0x0b, KEY_PROG1 }, /* app */
27 { 0x0c, KEY_ZOOM }, /* zoom/fullscreen */
28 { 0x0d, KEY_CHANNELUP }, /* channel */
29 { 0x0e, KEY_CHANNELDOWN }, /* channel- */
30 { 0x0f, KEY_VOLUMEUP },
31 { 0x10, KEY_VOLUMEDOWN },
32 { 0x11, KEY_TUNER }, /* AV */
33 { 0x12, KEY_NUMLOCK }, /* -/-- */
34 { 0x13, KEY_AUDIO }, /* audio */
35 { 0x14, KEY_MUTE },
36 { 0x15, KEY_UP },
37 { 0x16, KEY_DOWN },
38 { 0x17, KEY_LEFT },
39 { 0x18, KEY_RIGHT },
40 { 0x19, BTN_LEFT, },
41 { 0x1a, BTN_RIGHT, },
42 { 0x1b, KEY_WWW }, /* text */
43 { 0x1c, KEY_REWIND },
44 { 0x1d, KEY_FORWARD },
45 { 0x1e, KEY_RECORD },
46 { 0x1f, KEY_PLAY },
47 { 0x20, KEY_PREVIOUSSONG },
48 { 0x21, KEY_NEXTSONG },
49 { 0x22, KEY_PAUSE },
50 { 0x23, KEY_STOP },
51};
52DEFINE_LEGACY_IR_KEYTABLE(cinergy);
53#else
54DECLARE_IR_KEYTABLE(cinergy);
55#endif
diff --git a/include/media/keycodes/dm1105-nec.h b/include/media/keycodes/dm1105-nec.h
deleted file mode 100644
index b87d770747a..00000000000
--- a/include/media/keycodes/dm1105-nec.h
+++ /dev/null
@@ -1,52 +0,0 @@
1/* dm1105-nec.h - Keytable for dm1105_nec Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* DVBWorld remotes
12 Igor M. Liplianin <liplianin@me.by>
13 */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode dm1105_nec[] = {
17 { 0x0a, KEY_POWER2}, /* power */
18 { 0x0c, KEY_MUTE}, /* mute */
19 { 0x11, KEY_1},
20 { 0x12, KEY_2},
21 { 0x13, KEY_3},
22 { 0x14, KEY_4},
23 { 0x15, KEY_5},
24 { 0x16, KEY_6},
25 { 0x17, KEY_7},
26 { 0x18, KEY_8},
27 { 0x19, KEY_9},
28 { 0x10, KEY_0},
29 { 0x1c, KEY_CHANNELUP}, /* ch+ */
30 { 0x0f, KEY_CHANNELDOWN}, /* ch- */
31 { 0x1a, KEY_VOLUMEUP}, /* vol+ */
32 { 0x0e, KEY_VOLUMEDOWN}, /* vol- */
33 { 0x04, KEY_RECORD}, /* rec */
34 { 0x09, KEY_CHANNEL}, /* fav */
35 { 0x08, KEY_BACKSPACE}, /* rewind */
36 { 0x07, KEY_FASTFORWARD}, /* fast */
37 { 0x0b, KEY_PAUSE}, /* pause */
38 { 0x02, KEY_ESC}, /* cancel */
39 { 0x03, KEY_TAB}, /* tab */
40 { 0x00, KEY_UP}, /* up */
41 { 0x1f, KEY_ENTER}, /* ok */
42 { 0x01, KEY_DOWN}, /* down */
43 { 0x05, KEY_RECORD}, /* cap */
44 { 0x06, KEY_STOP}, /* stop */
45 { 0x40, KEY_ZOOM}, /* full */
46 { 0x1e, KEY_TV}, /* tvmode */
47 { 0x1b, KEY_B}, /* recall */
48};
49DEFINE_LEGACY_IR_KEYTABLE(dm1105_nec);
50#else
51DECLARE_IR_KEYTABLE(dm1105_nec);
52#endif
diff --git a/include/media/keycodes/dntv-live-dvb-t.h b/include/media/keycodes/dntv-live-dvb-t.h
deleted file mode 100644
index 4431ae6e206..00000000000
--- a/include/media/keycodes/dntv-live-dvb-t.h
+++ /dev/null
@@ -1,54 +0,0 @@
1/* dntv-live-dvb-t.h - Keytable for dntv_live_dvb_t Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* DigitalNow DNTV Live DVB-T Remote */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode dntv_live_dvb_t[] = {
15 { 0x00, KEY_ESC }, /* 'go up a level?' */
16 /* Keys 0 to 9 */
17 { 0x0a, KEY_0 },
18 { 0x01, KEY_1 },
19 { 0x02, KEY_2 },
20 { 0x03, KEY_3 },
21 { 0x04, KEY_4 },
22 { 0x05, KEY_5 },
23 { 0x06, KEY_6 },
24 { 0x07, KEY_7 },
25 { 0x08, KEY_8 },
26 { 0x09, KEY_9 },
27
28 { 0x0b, KEY_TUNER }, /* tv/fm */
29 { 0x0c, KEY_SEARCH }, /* scan */
30 { 0x0d, KEY_STOP },
31 { 0x0e, KEY_PAUSE },
32 { 0x0f, KEY_LIST }, /* source */
33
34 { 0x10, KEY_MUTE },
35 { 0x11, KEY_REWIND }, /* backward << */
36 { 0x12, KEY_POWER },
37 { 0x13, KEY_CAMERA }, /* snap */
38 { 0x14, KEY_AUDIO }, /* stereo */
39 { 0x15, KEY_CLEAR }, /* reset */
40 { 0x16, KEY_PLAY },
41 { 0x17, KEY_ENTER },
42 { 0x18, KEY_ZOOM }, /* full screen */
43 { 0x19, KEY_FASTFORWARD }, /* forward >> */
44 { 0x1a, KEY_CHANNELUP },
45 { 0x1b, KEY_VOLUMEUP },
46 { 0x1c, KEY_INFO }, /* preview */
47 { 0x1d, KEY_RECORD }, /* record */
48 { 0x1e, KEY_CHANNELDOWN },
49 { 0x1f, KEY_VOLUMEDOWN },
50};
51DEFINE_LEGACY_IR_KEYTABLE(dntv_live_dvb_t);
52#else
53DECLARE_IR_KEYTABLE(dntv_live_dvb_t);
54#endif
diff --git a/include/media/keycodes/dntv-live-dvbt-pro.h b/include/media/keycodes/dntv-live-dvbt-pro.h
deleted file mode 100644
index d64fa26503c..00000000000
--- a/include/media/keycodes/dntv-live-dvbt-pro.h
+++ /dev/null
@@ -1,73 +0,0 @@
1/* dntv-live-dvbt-pro.h - Keytable for dntv_live_dvbt_pro Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* DigitalNow DNTV Live! DVB-T Pro Remote */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode dntv_live_dvbt_pro[] = {
15 { 0x16, KEY_POWER },
16 { 0x5b, KEY_HOME },
17
18 { 0x55, KEY_TV }, /* live tv */
19 { 0x58, KEY_TUNER }, /* digital Radio */
20 { 0x5a, KEY_RADIO }, /* FM radio */
21 { 0x59, KEY_DVD }, /* dvd menu */
22 { 0x03, KEY_1 },
23 { 0x01, KEY_2 },
24 { 0x06, KEY_3 },
25 { 0x09, KEY_4 },
26 { 0x1d, KEY_5 },
27 { 0x1f, KEY_6 },
28 { 0x0d, KEY_7 },
29 { 0x19, KEY_8 },
30 { 0x1b, KEY_9 },
31 { 0x0c, KEY_CANCEL },
32 { 0x15, KEY_0 },
33 { 0x4a, KEY_CLEAR },
34 { 0x13, KEY_BACK },
35 { 0x00, KEY_TAB },
36 { 0x4b, KEY_UP },
37 { 0x4e, KEY_LEFT },
38 { 0x4f, KEY_OK },
39 { 0x52, KEY_RIGHT },
40 { 0x51, KEY_DOWN },
41 { 0x1e, KEY_VOLUMEUP },
42 { 0x0a, KEY_VOLUMEDOWN },
43 { 0x02, KEY_CHANNELDOWN },
44 { 0x05, KEY_CHANNELUP },
45 { 0x11, KEY_RECORD },
46 { 0x14, KEY_PLAY },
47 { 0x4c, KEY_PAUSE },
48 { 0x1a, KEY_STOP },
49 { 0x40, KEY_REWIND },
50 { 0x12, KEY_FASTFORWARD },
51 { 0x41, KEY_PREVIOUSSONG }, /* replay |< */
52 { 0x42, KEY_NEXTSONG }, /* skip >| */
53 { 0x54, KEY_CAMERA }, /* capture */
54 { 0x50, KEY_LANGUAGE }, /* sap */
55 { 0x47, KEY_TV2 }, /* pip */
56 { 0x4d, KEY_SCREEN },
57 { 0x43, KEY_SUBTITLE },
58 { 0x10, KEY_MUTE },
59 { 0x49, KEY_AUDIO }, /* l/r */
60 { 0x07, KEY_SLEEP },
61 { 0x08, KEY_VIDEO }, /* a/v */
62 { 0x0e, KEY_PREVIOUS }, /* recall */
63 { 0x45, KEY_ZOOM }, /* zoom + */
64 { 0x46, KEY_ANGLE }, /* zoom - */
65 { 0x56, KEY_RED },
66 { 0x57, KEY_GREEN },
67 { 0x5c, KEY_YELLOW },
68 { 0x5d, KEY_BLUE },
69};
70DEFINE_LEGACY_IR_KEYTABLE(dntv_live_dvbt_pro);
71#else
72DECLARE_IR_KEYTABLE(dntv_live_dvbt_pro);
73#endif
diff --git a/include/media/keycodes/em-terratec.h b/include/media/keycodes/em-terratec.h
deleted file mode 100644
index 906557d0614..00000000000
--- a/include/media/keycodes/em-terratec.h
+++ /dev/null
@@ -1,46 +0,0 @@
1/* em-terratec.h - Keytable for em_terratec Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode em_terratec[] = {
14 { 0x01, KEY_CHANNEL },
15 { 0x02, KEY_SELECT },
16 { 0x03, KEY_MUTE },
17 { 0x04, KEY_POWER },
18 { 0x05, KEY_1 },
19 { 0x06, KEY_2 },
20 { 0x07, KEY_3 },
21 { 0x08, KEY_CHANNELUP },
22 { 0x09, KEY_4 },
23 { 0x0a, KEY_5 },
24 { 0x0b, KEY_6 },
25 { 0x0c, KEY_CHANNELDOWN },
26 { 0x0d, KEY_7 },
27 { 0x0e, KEY_8 },
28 { 0x0f, KEY_9 },
29 { 0x10, KEY_VOLUMEUP },
30 { 0x11, KEY_0 },
31 { 0x12, KEY_MENU },
32 { 0x13, KEY_PRINT },
33 { 0x14, KEY_VOLUMEDOWN },
34 { 0x16, KEY_PAUSE },
35 { 0x18, KEY_RECORD },
36 { 0x19, KEY_REWIND },
37 { 0x1a, KEY_PLAY },
38 { 0x1b, KEY_FORWARD },
39 { 0x1c, KEY_BACKSPACE },
40 { 0x1e, KEY_STOP },
41 { 0x40, KEY_ZOOM },
42};
43DEFINE_LEGACY_IR_KEYTABLE(em_terratec);
44#else
45DECLARE_IR_KEYTABLE(em_terratec);
46#endif
diff --git a/include/media/keycodes/empty.h b/include/media/keycodes/empty.h
deleted file mode 100644
index aea866c42b2..00000000000
--- a/include/media/keycodes/empty.h
+++ /dev/null
@@ -1,20 +0,0 @@
1/* empty.h - Keytable for empty Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* empty keytable, can be used as placeholder for not-yet created keytables */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode empty[] = {
15 { 0x2a, KEY_COFFEE },
16};
17DEFINE_LEGACY_IR_KEYTABLE(empty);
18#else
19DECLARE_IR_KEYTABLE(empty);
20#endif
diff --git a/include/media/keycodes/encore-enltv-fm53.h b/include/media/keycodes/encore-enltv-fm53.h
deleted file mode 100644
index bccb7440676..00000000000
--- a/include/media/keycodes/encore-enltv-fm53.h
+++ /dev/null
@@ -1,57 +0,0 @@
1/* encore-enltv-fm53.h - Keytable for encore_enltv_fm53 Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Encore ENLTV-FM v5.3
12 Mauro Carvalho Chehab <mchehab@infradead.org>
13 */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode encore_enltv_fm53[] = {
17 { 0x10, KEY_POWER2},
18 { 0x06, KEY_MUTE},
19
20 { 0x09, KEY_1},
21 { 0x1d, KEY_2},
22 { 0x1f, KEY_3},
23 { 0x19, KEY_4},
24 { 0x1b, KEY_5},
25 { 0x11, KEY_6},
26 { 0x17, KEY_7},
27 { 0x12, KEY_8},
28 { 0x16, KEY_9},
29 { 0x48, KEY_0},
30
31 { 0x04, KEY_LIST}, /* -/-- */
32 { 0x40, KEY_LAST}, /* recall */
33
34 { 0x02, KEY_MODE}, /* TV/AV */
35 { 0x05, KEY_CAMERA}, /* SNAPSHOT */
36
37 { 0x4c, KEY_CHANNELUP}, /* UP */
38 { 0x00, KEY_CHANNELDOWN}, /* DOWN */
39 { 0x0d, KEY_VOLUMEUP}, /* RIGHT */
40 { 0x15, KEY_VOLUMEDOWN}, /* LEFT */
41 { 0x49, KEY_ENTER}, /* OK */
42
43 { 0x54, KEY_RECORD},
44 { 0x4d, KEY_PLAY}, /* pause */
45
46 { 0x1e, KEY_MENU}, /* video setting */
47 { 0x0e, KEY_RIGHT}, /* <- */
48 { 0x1a, KEY_LEFT}, /* -> */
49
50 { 0x0a, KEY_CLEAR}, /* video default */
51 { 0x0c, KEY_ZOOM}, /* hide pannel */
52 { 0x47, KEY_SLEEP}, /* shutdown */
53};
54DEFINE_LEGACY_IR_KEYTABLE(encore_enltv_fm53);
55#else
56DECLARE_IR_KEYTABLE(encore_enltv_fm53);
57#endif
diff --git a/include/media/keycodes/encore-enltv.h b/include/media/keycodes/encore-enltv.h
deleted file mode 100644
index 4c55b526129..00000000000
--- a/include/media/keycodes/encore-enltv.h
+++ /dev/null
@@ -1,88 +0,0 @@
1/* encore-enltv.h - Keytable for encore_enltv Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Encore ENLTV-FM - black plastic, white front cover with white glowing buttons
12 Juan Pablo Sormani <sorman@gmail.com> */
13
14#ifdef IR_KEYMAPS
15static struct ir_scancode encore_enltv[] = {
16
17 /* Power button does nothing, neither in Windows app,
18 although it sends data (used for BIOS wakeup?) */
19 { 0x0d, KEY_MUTE },
20
21 { 0x1e, KEY_TV },
22 { 0x00, KEY_VIDEO },
23 { 0x01, KEY_AUDIO }, /* music */
24 { 0x02, KEY_MHP }, /* picture */
25
26 { 0x1f, KEY_1 },
27 { 0x03, KEY_2 },
28 { 0x04, KEY_3 },
29 { 0x05, KEY_4 },
30 { 0x1c, KEY_5 },
31 { 0x06, KEY_6 },
32 { 0x07, KEY_7 },
33 { 0x08, KEY_8 },
34 { 0x1d, KEY_9 },
35 { 0x0a, KEY_0 },
36
37 { 0x09, KEY_LIST }, /* -/-- */
38 { 0x0b, KEY_LAST }, /* recall */
39
40 { 0x14, KEY_HOME }, /* win start menu */
41 { 0x15, KEY_EXIT }, /* exit */
42 { 0x16, KEY_CHANNELUP }, /* UP */
43 { 0x12, KEY_CHANNELDOWN }, /* DOWN */
44 { 0x0c, KEY_VOLUMEUP }, /* RIGHT */
45 { 0x17, KEY_VOLUMEDOWN }, /* LEFT */
46
47 { 0x18, KEY_ENTER }, /* OK */
48
49 { 0x0e, KEY_ESC },
50 { 0x13, KEY_CYCLEWINDOWS }, /* desktop */
51 { 0x11, KEY_TAB },
52 { 0x19, KEY_SWITCHVIDEOMODE }, /* switch */
53
54 { 0x1a, KEY_MENU },
55 { 0x1b, KEY_ZOOM }, /* fullscreen */
56 { 0x44, KEY_TIME }, /* time shift */
57 { 0x40, KEY_MODE }, /* source */
58
59 { 0x5a, KEY_RECORD },
60 { 0x42, KEY_PLAY }, /* play/pause */
61 { 0x45, KEY_STOP },
62 { 0x43, KEY_CAMERA }, /* camera icon */
63
64 { 0x48, KEY_REWIND },
65 { 0x4a, KEY_FASTFORWARD },
66 { 0x49, KEY_PREVIOUS },
67 { 0x4b, KEY_NEXT },
68
69 { 0x4c, KEY_FAVORITES }, /* tv wall */
70 { 0x4d, KEY_SOUND }, /* DVD sound */
71 { 0x4e, KEY_LANGUAGE }, /* DVD lang */
72 { 0x4f, KEY_TEXT }, /* DVD text */
73
74 { 0x50, KEY_SLEEP }, /* shutdown */
75 { 0x51, KEY_MODE }, /* stereo > main */
76 { 0x52, KEY_SELECT }, /* stereo > sap */
77 { 0x53, KEY_PROG1 }, /* teletext */
78
79
80 { 0x59, KEY_RED }, /* AP1 */
81 { 0x41, KEY_GREEN }, /* AP2 */
82 { 0x47, KEY_YELLOW }, /* AP3 */
83 { 0x57, KEY_BLUE }, /* AP4 */
84};
85DEFINE_LEGACY_IR_KEYTABLE(encore_enltv);
86#else
87DECLARE_IR_KEYTABLE(encore_enltv);
88#endif
diff --git a/include/media/keycodes/encore-enltv2.h b/include/media/keycodes/encore-enltv2.h
deleted file mode 100644
index 6b37fbcfc4a..00000000000
--- a/include/media/keycodes/encore-enltv2.h
+++ /dev/null
@@ -1,66 +0,0 @@
1/* encore-enltv2.h - Keytable for encore_enltv2 Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Encore ENLTV2-FM - silver plastic - "Wand Media" written at the botton
12 Mauro Carvalho Chehab <mchehab@infradead.org> */
13
14#ifdef IR_KEYMAPS
15static struct ir_scancode encore_enltv2[] = {
16 { 0x4c, KEY_POWER2 },
17 { 0x4a, KEY_TUNER },
18 { 0x40, KEY_1 },
19 { 0x60, KEY_2 },
20 { 0x50, KEY_3 },
21 { 0x70, KEY_4 },
22 { 0x48, KEY_5 },
23 { 0x68, KEY_6 },
24 { 0x58, KEY_7 },
25 { 0x78, KEY_8 },
26 { 0x44, KEY_9 },
27 { 0x54, KEY_0 },
28
29 { 0x64, KEY_LAST }, /* +100 */
30 { 0x4e, KEY_AGAIN }, /* Recall */
31
32 { 0x6c, KEY_SWITCHVIDEOMODE }, /* Video Source */
33 { 0x5e, KEY_MENU },
34 { 0x56, KEY_SCREEN },
35 { 0x7a, KEY_SETUP },
36
37 { 0x46, KEY_MUTE },
38 { 0x5c, KEY_MODE }, /* Stereo */
39 { 0x74, KEY_INFO },
40 { 0x7c, KEY_CLEAR },
41
42 { 0x55, KEY_UP },
43 { 0x49, KEY_DOWN },
44 { 0x7e, KEY_LEFT },
45 { 0x59, KEY_RIGHT },
46 { 0x6a, KEY_ENTER },
47
48 { 0x42, KEY_VOLUMEUP },
49 { 0x62, KEY_VOLUMEDOWN },
50 { 0x52, KEY_CHANNELUP },
51 { 0x72, KEY_CHANNELDOWN },
52
53 { 0x41, KEY_RECORD },
54 { 0x51, KEY_CAMERA }, /* Snapshot */
55 { 0x75, KEY_TIME }, /* Timeshift */
56 { 0x71, KEY_TV2 }, /* PIP */
57
58 { 0x45, KEY_REWIND },
59 { 0x6f, KEY_PAUSE },
60 { 0x7d, KEY_FORWARD },
61 { 0x79, KEY_STOP },
62};
63DEFINE_LEGACY_IR_KEYTABLE(encore_enltv2);
64#else
65DECLARE_IR_KEYTABLE(encore_enltv2);
66#endif
diff --git a/include/media/keycodes/evga-indtube.h b/include/media/keycodes/evga-indtube.h
deleted file mode 100644
index 2aab58d7503..00000000000
--- a/include/media/keycodes/evga-indtube.h
+++ /dev/null
@@ -1,37 +0,0 @@
1/* evga-indtube.h - Keytable for evga_indtube Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* EVGA inDtube
12 Devin Heitmueller <devin.heitmueller@gmail.com>
13 */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode evga_indtube[] = {
17 { 0x12, KEY_POWER},
18 { 0x02, KEY_MODE}, /* TV */
19 { 0x14, KEY_MUTE},
20 { 0x1a, KEY_CHANNELUP},
21 { 0x16, KEY_TV2}, /* PIP */
22 { 0x1d, KEY_VOLUMEUP},
23 { 0x05, KEY_CHANNELDOWN},
24 { 0x0f, KEY_PLAYPAUSE},
25 { 0x19, KEY_VOLUMEDOWN},
26 { 0x1c, KEY_REWIND},
27 { 0x0d, KEY_RECORD},
28 { 0x18, KEY_FORWARD},
29 { 0x1e, KEY_PREVIOUS},
30 { 0x1b, KEY_STOP},
31 { 0x1f, KEY_NEXT},
32 { 0x13, KEY_CAMERA},
33};
34DEFINE_LEGACY_IR_KEYTABLE(evga_indtube);
35#else
36DECLARE_IR_KEYTABLE(evga_indtube);
37#endif
diff --git a/include/media/keycodes/eztv.h b/include/media/keycodes/eztv.h
deleted file mode 100644
index 030f57a6134..00000000000
--- a/include/media/keycodes/eztv.h
+++ /dev/null
@@ -1,72 +0,0 @@
1/* eztv.h - Keytable for eztv Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Alfons Geser <a.geser@cox.net>
12 * updates from Job D. R. Borges <jobdrb@ig.com.br> */
13
14#ifdef IR_KEYMAPS
15static struct ir_scancode eztv[] = {
16 { 0x12, KEY_POWER },
17 { 0x01, KEY_TV }, /* DVR */
18 { 0x15, KEY_DVD }, /* DVD */
19 { 0x17, KEY_AUDIO }, /* music */
20 /* DVR mode / DVD mode / music mode */
21
22 { 0x1b, KEY_MUTE }, /* mute */
23 { 0x02, KEY_LANGUAGE }, /* MTS/SAP / audio / autoseek */
24 { 0x1e, KEY_SUBTITLE }, /* closed captioning / subtitle / seek */
25 { 0x16, KEY_ZOOM }, /* full screen */
26 { 0x1c, KEY_VIDEO }, /* video source / eject / delall */
27 { 0x1d, KEY_RESTART }, /* playback / angle / del */
28 { 0x2f, KEY_SEARCH }, /* scan / menu / playlist */
29 { 0x30, KEY_CHANNEL }, /* CH surfing / bookmark / memo */
30
31 { 0x31, KEY_HELP }, /* help */
32 { 0x32, KEY_MODE }, /* num/memo */
33 { 0x33, KEY_ESC }, /* cancel */
34
35 { 0x0c, KEY_UP }, /* up */
36 { 0x10, KEY_DOWN }, /* down */
37 { 0x08, KEY_LEFT }, /* left */
38 { 0x04, KEY_RIGHT }, /* right */
39 { 0x03, KEY_SELECT }, /* select */
40
41 { 0x1f, KEY_REWIND }, /* rewind */
42 { 0x20, KEY_PLAYPAUSE },/* play/pause */
43 { 0x29, KEY_FORWARD }, /* forward */
44 { 0x14, KEY_AGAIN }, /* repeat */
45 { 0x2b, KEY_RECORD }, /* recording */
46 { 0x2c, KEY_STOP }, /* stop */
47 { 0x2d, KEY_PLAY }, /* play */
48 { 0x2e, KEY_CAMERA }, /* snapshot / shuffle */
49
50 { 0x00, KEY_0 },
51 { 0x05, KEY_1 },
52 { 0x06, KEY_2 },
53 { 0x07, KEY_3 },
54 { 0x09, KEY_4 },
55 { 0x0a, KEY_5 },
56 { 0x0b, KEY_6 },
57 { 0x0d, KEY_7 },
58 { 0x0e, KEY_8 },
59 { 0x0f, KEY_9 },
60
61 { 0x2a, KEY_VOLUMEUP },
62 { 0x11, KEY_VOLUMEDOWN },
63 { 0x18, KEY_CHANNELUP },/* CH.tracking up */
64 { 0x19, KEY_CHANNELDOWN },/* CH.tracking down */
65
66 { 0x13, KEY_ENTER }, /* enter */
67 { 0x21, KEY_DOT }, /* . (decimal dot) */
68};
69DEFINE_LEGACY_IR_KEYTABLE(eztv);
70#else
71DECLARE_IR_KEYTABLE(eztv);
72#endif
diff --git a/include/media/keycodes/flydvb.h b/include/media/keycodes/flydvb.h
deleted file mode 100644
index b270cc058b7..00000000000
--- a/include/media/keycodes/flydvb.h
+++ /dev/null
@@ -1,54 +0,0 @@
1/* flydvb.h - Keytable for flydvb Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode flydvb[] = {
14 { 0x01, KEY_ZOOM }, /* Full Screen */
15 { 0x00, KEY_POWER }, /* Power */
16
17 { 0x03, KEY_1 },
18 { 0x04, KEY_2 },
19 { 0x05, KEY_3 },
20 { 0x07, KEY_4 },
21 { 0x08, KEY_5 },
22 { 0x09, KEY_6 },
23 { 0x0b, KEY_7 },
24 { 0x0c, KEY_8 },
25 { 0x0d, KEY_9 },
26 { 0x06, KEY_AGAIN }, /* Recall */
27 { 0x0f, KEY_0 },
28 { 0x10, KEY_MUTE }, /* Mute */
29 { 0x02, KEY_RADIO }, /* TV/Radio */
30 { 0x1b, KEY_LANGUAGE }, /* SAP (Second Audio Program) */
31
32 { 0x14, KEY_VOLUMEUP }, /* VOL+ */
33 { 0x17, KEY_VOLUMEDOWN }, /* VOL- */
34 { 0x12, KEY_CHANNELUP }, /* CH+ */
35 { 0x13, KEY_CHANNELDOWN }, /* CH- */
36 { 0x1d, KEY_ENTER }, /* Enter */
37
38 { 0x1a, KEY_MODE }, /* PIP */
39 { 0x18, KEY_TUNER }, /* Source */
40
41 { 0x1e, KEY_RECORD }, /* Record/Pause */
42 { 0x15, KEY_ANGLE }, /* Swap (no label on key) */
43 { 0x1c, KEY_PAUSE }, /* Timeshift/Pause */
44 { 0x19, KEY_BACK }, /* Rewind << */
45 { 0x0a, KEY_PLAYPAUSE }, /* Play/Pause */
46 { 0x1f, KEY_FORWARD }, /* Forward >> */
47 { 0x16, KEY_PREVIOUS }, /* Back |<< */
48 { 0x11, KEY_STOP }, /* Stop */
49 { 0x0e, KEY_NEXT }, /* End >>| */
50};
51DEFINE_LEGACY_IR_KEYTABLE(flydvb);
52#else
53DECLARE_IR_KEYTABLE(flydvb);
54#endif
diff --git a/include/media/keycodes/flyvideo.h b/include/media/keycodes/flyvideo.h
deleted file mode 100644
index 5c52f92d039..00000000000
--- a/include/media/keycodes/flyvideo.h
+++ /dev/null
@@ -1,47 +0,0 @@
1/* flyvideo.h - Keytable for flyvideo Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode flyvideo[] = {
14 { 0x0f, KEY_0 },
15 { 0x03, KEY_1 },
16 { 0x04, KEY_2 },
17 { 0x05, KEY_3 },
18 { 0x07, KEY_4 },
19 { 0x08, KEY_5 },
20 { 0x09, KEY_6 },
21 { 0x0b, KEY_7 },
22 { 0x0c, KEY_8 },
23 { 0x0d, KEY_9 },
24
25 { 0x0e, KEY_MODE }, /* Air/Cable */
26 { 0x11, KEY_VIDEO }, /* Video */
27 { 0x15, KEY_AUDIO }, /* Audio */
28 { 0x00, KEY_POWER }, /* Power */
29 { 0x18, KEY_TUNER }, /* AV Source */
30 { 0x02, KEY_ZOOM }, /* Fullscreen */
31 { 0x1a, KEY_LANGUAGE }, /* Stereo */
32 { 0x1b, KEY_MUTE }, /* Mute */
33 { 0x14, KEY_VOLUMEUP }, /* Volume + */
34 { 0x17, KEY_VOLUMEDOWN },/* Volume - */
35 { 0x12, KEY_CHANNELUP },/* Channel + */
36 { 0x13, KEY_CHANNELDOWN },/* Channel - */
37 { 0x06, KEY_AGAIN }, /* Recall */
38 { 0x10, KEY_ENTER }, /* Enter */
39
40 { 0x19, KEY_BACK }, /* Rewind ( <<< ) */
41 { 0x1f, KEY_FORWARD }, /* Forward ( >>> ) */
42 { 0x0a, KEY_ANGLE }, /* no label, may be used as the PAUSE button */
43};
44DEFINE_LEGACY_IR_KEYTABLE(flyvideo);
45#else
46DECLARE_IR_KEYTABLE(flyvideo);
47#endif
diff --git a/include/media/keycodes/fusionhdtv-mce.h b/include/media/keycodes/fusionhdtv-mce.h
deleted file mode 100644
index bf2998f6a9d..00000000000
--- a/include/media/keycodes/fusionhdtv-mce.h
+++ /dev/null
@@ -1,74 +0,0 @@
1/* fusionhdtv-mce.h - Keytable for fusionhdtv_mce Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* DViCO FUSION HDTV MCE remote */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode fusionhdtv_mce[] = {
15
16 { 0x0b, KEY_1 },
17 { 0x17, KEY_2 },
18 { 0x1b, KEY_3 },
19 { 0x07, KEY_4 },
20 { 0x50, KEY_5 },
21 { 0x54, KEY_6 },
22 { 0x48, KEY_7 },
23 { 0x4c, KEY_8 },
24 { 0x58, KEY_9 },
25 { 0x03, KEY_0 },
26
27 { 0x5e, KEY_OK },
28 { 0x51, KEY_UP },
29 { 0x53, KEY_DOWN },
30 { 0x5b, KEY_LEFT },
31 { 0x5f, KEY_RIGHT },
32
33 { 0x02, KEY_TV }, /* Labeled DTV on remote */
34 { 0x0e, KEY_MP3 },
35 { 0x1a, KEY_DVD },
36 { 0x1e, KEY_FAVORITES }, /* Labeled CPF on remote */
37 { 0x16, KEY_SETUP },
38 { 0x46, KEY_POWER2 }, /* TV On/Off button on remote */
39 { 0x0a, KEY_EPG }, /* Labeled Guide on remote */
40
41 { 0x49, KEY_BACK },
42 { 0x59, KEY_INFO }, /* Labeled MORE on remote */
43 { 0x4d, KEY_MENU }, /* Labeled DVDMENU on remote */
44 { 0x55, KEY_CYCLEWINDOWS }, /* Labeled ALT-TAB on remote */
45
46 { 0x0f, KEY_PREVIOUSSONG }, /* Labeled |<< REPLAY on remote */
47 { 0x12, KEY_NEXTSONG }, /* Labeled >>| SKIP on remote */
48 { 0x42, KEY_ENTER }, /* Labeled START with a green
49 MS windows logo on remote */
50
51 { 0x15, KEY_VOLUMEUP },
52 { 0x05, KEY_VOLUMEDOWN },
53 { 0x11, KEY_CHANNELUP },
54 { 0x09, KEY_CHANNELDOWN },
55
56 { 0x52, KEY_CAMERA },
57 { 0x5a, KEY_TUNER },
58 { 0x19, KEY_OPEN },
59
60 { 0x13, KEY_MODE }, /* 4:3 16:9 select */
61 { 0x1f, KEY_ZOOM },
62
63 { 0x43, KEY_REWIND },
64 { 0x47, KEY_PLAYPAUSE },
65 { 0x4f, KEY_FASTFORWARD },
66 { 0x57, KEY_MUTE },
67 { 0x0d, KEY_STOP },
68 { 0x01, KEY_RECORD },
69 { 0x4e, KEY_POWER },
70};
71DEFINE_LEGACY_IR_KEYTABLE(fusionhdtv_mce);
72#else
73DECLARE_IR_KEYTABLE(fusionhdtv_mce);
74#endif
diff --git a/include/media/keycodes/gadmei-rm008z.h b/include/media/keycodes/gadmei-rm008z.h
deleted file mode 100644
index b73d3e5d729..00000000000
--- a/include/media/keycodes/gadmei-rm008z.h
+++ /dev/null
@@ -1,57 +0,0 @@
1/* gadmei-rm008z.h - Keytable for gadmei_rm008z Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* GADMEI UTV330+ RM008Z remote
12 Shine Liu <shinel@foxmail.com>
13 */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode gadmei_rm008z[] = {
17 { 0x14, KEY_POWER2}, /* POWER OFF */
18 { 0x0c, KEY_MUTE}, /* MUTE */
19
20 { 0x18, KEY_TV}, /* TV */
21 { 0x0e, KEY_VIDEO}, /* AV */
22 { 0x0b, KEY_AUDIO}, /* SV */
23 { 0x0f, KEY_RADIO}, /* FM */
24
25 { 0x00, KEY_1},
26 { 0x01, KEY_2},
27 { 0x02, KEY_3},
28 { 0x03, KEY_4},
29 { 0x04, KEY_5},
30 { 0x05, KEY_6},
31 { 0x06, KEY_7},
32 { 0x07, KEY_8},
33 { 0x08, KEY_9},
34 { 0x09, KEY_0},
35 { 0x0a, KEY_INFO}, /* OSD */
36 { 0x1c, KEY_BACKSPACE}, /* LAST */
37
38 { 0x0d, KEY_PLAY}, /* PLAY */
39 { 0x1e, KEY_CAMERA}, /* SNAPSHOT */
40 { 0x1a, KEY_RECORD}, /* RECORD */
41 { 0x17, KEY_STOP}, /* STOP */
42
43 { 0x1f, KEY_UP}, /* UP */
44 { 0x44, KEY_DOWN}, /* DOWN */
45 { 0x46, KEY_TAB}, /* BACK */
46 { 0x4a, KEY_ZOOM}, /* FULLSECREEN */
47
48 { 0x10, KEY_VOLUMEUP}, /* VOLUMEUP */
49 { 0x11, KEY_VOLUMEDOWN}, /* VOLUMEDOWN */
50 { 0x12, KEY_CHANNELUP}, /* CHANNELUP */
51 { 0x13, KEY_CHANNELDOWN}, /* CHANNELDOWN */
52 { 0x15, KEY_ENTER}, /* OK */
53};
54DEFINE_LEGACY_IR_KEYTABLE(gadmei_rm008z);
55#else
56DECLARE_IR_KEYTABLE(gadmei_rm008z);
57#endif
diff --git a/include/media/keycodes/genius-tvgo-a11mce.h b/include/media/keycodes/genius-tvgo-a11mce.h
deleted file mode 100644
index b0aad3b489b..00000000000
--- a/include/media/keycodes/genius-tvgo-a11mce.h
+++ /dev/null
@@ -1,60 +0,0 @@
1/* genius-tvgo-a11mce.h - Keytable for genius_tvgo_a11mce Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/*
12 * Remote control for the Genius TVGO A11MCE
13 * Adrian Pardini <pardo.bsso@gmail.com>
14 */
15
16#ifdef IR_KEYMAPS
17static struct ir_scancode genius_tvgo_a11mce[] = {
18 /* Keys 0 to 9 */
19 { 0x48, KEY_0 },
20 { 0x09, KEY_1 },
21 { 0x1d, KEY_2 },
22 { 0x1f, KEY_3 },
23 { 0x19, KEY_4 },
24 { 0x1b, KEY_5 },
25 { 0x11, KEY_6 },
26 { 0x17, KEY_7 },
27 { 0x12, KEY_8 },
28 { 0x16, KEY_9 },
29
30 { 0x54, KEY_RECORD }, /* recording */
31 { 0x06, KEY_MUTE }, /* mute */
32 { 0x10, KEY_POWER },
33 { 0x40, KEY_LAST }, /* recall */
34 { 0x4c, KEY_CHANNELUP }, /* channel / program + */
35 { 0x00, KEY_CHANNELDOWN }, /* channel / program - */
36 { 0x0d, KEY_VOLUMEUP },
37 { 0x15, KEY_VOLUMEDOWN },
38 { 0x4d, KEY_OK }, /* also labeled as Pause */
39 { 0x1c, KEY_ZOOM }, /* full screen and Stop*/
40 { 0x02, KEY_MODE }, /* AV Source or Rewind*/
41 { 0x04, KEY_LIST }, /* -/-- */
42 /* small arrows above numbers */
43 { 0x1a, KEY_NEXT }, /* also Fast Forward */
44 { 0x0e, KEY_PREVIOUS }, /* also Rewind */
45 /* these are in a rather non standard layout and have
46 an alternate name written */
47 { 0x1e, KEY_UP }, /* Video Setting */
48 { 0x0a, KEY_DOWN }, /* Video Default */
49 { 0x05, KEY_CAMERA }, /* Snapshot */
50 { 0x0c, KEY_RIGHT }, /* Hide Panel */
51 /* Four buttons without label */
52 { 0x49, KEY_RED },
53 { 0x0b, KEY_GREEN },
54 { 0x13, KEY_YELLOW },
55 { 0x50, KEY_BLUE },
56};
57DEFINE_LEGACY_IR_KEYTABLE(genius_tvgo_a11mce);
58#else
59DECLARE_IR_KEYTABLE(genius_tvgo_a11mce);
60#endif
diff --git a/include/media/keycodes/gotview7135.h b/include/media/keycodes/gotview7135.h
deleted file mode 100644
index 1d108e85a34..00000000000
--- a/include/media/keycodes/gotview7135.h
+++ /dev/null
@@ -1,55 +0,0 @@
1/* gotview7135.h - Keytable for gotview7135 Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Mike Baikov <mike@baikov.com> */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode gotview7135[] = {
15
16 { 0x11, KEY_POWER },
17 { 0x35, KEY_TV },
18 { 0x1b, KEY_0 },
19 { 0x29, KEY_1 },
20 { 0x19, KEY_2 },
21 { 0x39, KEY_3 },
22 { 0x1f, KEY_4 },
23 { 0x2c, KEY_5 },
24 { 0x21, KEY_6 },
25 { 0x24, KEY_7 },
26 { 0x18, KEY_8 },
27 { 0x2b, KEY_9 },
28 { 0x3b, KEY_AGAIN }, /* LOOP */
29 { 0x06, KEY_AUDIO },
30 { 0x31, KEY_PRINT }, /* PREVIEW */
31 { 0x3e, KEY_VIDEO },
32 { 0x10, KEY_CHANNELUP },
33 { 0x20, KEY_CHANNELDOWN },
34 { 0x0c, KEY_VOLUMEDOWN },
35 { 0x28, KEY_VOLUMEUP },
36 { 0x08, KEY_MUTE },
37 { 0x26, KEY_SEARCH }, /* SCAN */
38 { 0x3f, KEY_CAMERA }, /* SNAPSHOT */
39 { 0x12, KEY_RECORD },
40 { 0x32, KEY_STOP },
41 { 0x3c, KEY_PLAY },
42 { 0x1d, KEY_REWIND },
43 { 0x2d, KEY_PAUSE },
44 { 0x0d, KEY_FORWARD },
45 { 0x05, KEY_ZOOM }, /*FULL*/
46
47 { 0x2a, KEY_F21 }, /* LIVE TIMESHIFT */
48 { 0x0e, KEY_F22 }, /* MIN TIMESHIFT */
49 { 0x1e, KEY_TIME }, /* TIMESHIFT */
50 { 0x38, KEY_F24 }, /* NORMAL TIMESHIFT */
51};
52DEFINE_LEGACY_IR_KEYTABLE(gotview7135);
53#else
54DECLARE_IR_KEYTABLE(gotview7135);
55#endif
diff --git a/include/media/keycodes/hauppauge-new.h b/include/media/keycodes/hauppauge-new.h
deleted file mode 100644
index f06702d0ebd..00000000000
--- a/include/media/keycodes/hauppauge-new.h
+++ /dev/null
@@ -1,76 +0,0 @@
1/* hauppauge-new.h - Keytable for hauppauge_new Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Hauppauge: the newer, gray remotes (seems there are multiple
12 * slightly different versions), shipped with cx88+ivtv cards.
13 * almost rc5 coding, but some non-standard keys */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode hauppauge_new[] = {
17 /* Keys 0 to 9 */
18 { 0x00, KEY_0 },
19 { 0x01, KEY_1 },
20 { 0x02, KEY_2 },
21 { 0x03, KEY_3 },
22 { 0x04, KEY_4 },
23 { 0x05, KEY_5 },
24 { 0x06, KEY_6 },
25 { 0x07, KEY_7 },
26 { 0x08, KEY_8 },
27 { 0x09, KEY_9 },
28
29 { 0x0a, KEY_TEXT }, /* keypad asterisk as well */
30 { 0x0b, KEY_RED }, /* red button */
31 { 0x0c, KEY_RADIO },
32 { 0x0d, KEY_MENU },
33 { 0x0e, KEY_SUBTITLE }, /* also the # key */
34 { 0x0f, KEY_MUTE },
35 { 0x10, KEY_VOLUMEUP },
36 { 0x11, KEY_VOLUMEDOWN },
37 { 0x12, KEY_PREVIOUS }, /* previous channel */
38 { 0x14, KEY_UP },
39 { 0x15, KEY_DOWN },
40 { 0x16, KEY_LEFT },
41 { 0x17, KEY_RIGHT },
42 { 0x18, KEY_VIDEO }, /* Videos */
43 { 0x19, KEY_AUDIO }, /* Music */
44 /* 0x1a: Pictures - presume this means
45 "Multimedia Home Platform" -
46 no "PICTURES" key in input.h
47 */
48 { 0x1a, KEY_MHP },
49
50 { 0x1b, KEY_EPG }, /* Guide */
51 { 0x1c, KEY_TV },
52 { 0x1e, KEY_NEXTSONG }, /* skip >| */
53 { 0x1f, KEY_EXIT }, /* back/exit */
54 { 0x20, KEY_CHANNELUP }, /* channel / program + */
55 { 0x21, KEY_CHANNELDOWN }, /* channel / program - */
56 { 0x22, KEY_CHANNEL }, /* source (old black remote) */
57 { 0x24, KEY_PREVIOUSSONG }, /* replay |< */
58 { 0x25, KEY_ENTER }, /* OK */
59 { 0x26, KEY_SLEEP }, /* minimize (old black remote) */
60 { 0x29, KEY_BLUE }, /* blue key */
61 { 0x2e, KEY_GREEN }, /* green button */
62 { 0x30, KEY_PAUSE }, /* pause */
63 { 0x32, KEY_REWIND }, /* backward << */
64 { 0x34, KEY_FASTFORWARD }, /* forward >> */
65 { 0x35, KEY_PLAY },
66 { 0x36, KEY_STOP },
67 { 0x37, KEY_RECORD }, /* recording */
68 { 0x38, KEY_YELLOW }, /* yellow key */
69 { 0x3b, KEY_SELECT }, /* top right button */
70 { 0x3c, KEY_ZOOM }, /* full */
71 { 0x3d, KEY_POWER }, /* system power (green button) */
72};
73DEFINE_LEGACY_IR_KEYTABLE(hauppauge_new);
74#else
75DECLARE_IR_KEYTABLE(hauppauge_new);
76#endif
diff --git a/include/media/keycodes/iodata-bctv7e.h b/include/media/keycodes/iodata-bctv7e.h
deleted file mode 100644
index 6dea92a8f3a..00000000000
--- a/include/media/keycodes/iodata-bctv7e.h
+++ /dev/null
@@ -1,64 +0,0 @@
1/* iodata-bctv7e.h - Keytable for iodata_bctv7e Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* IO-DATA BCTV7E Remote */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode iodata_bctv7e[] = {
15 { 0x40, KEY_TV },
16 { 0x20, KEY_RADIO }, /* FM */
17 { 0x60, KEY_EPG },
18 { 0x00, KEY_POWER },
19
20 /* Keys 0 to 9 */
21 { 0x44, KEY_0 }, /* 10 */
22 { 0x50, KEY_1 },
23 { 0x30, KEY_2 },
24 { 0x70, KEY_3 },
25 { 0x48, KEY_4 },
26 { 0x28, KEY_5 },
27 { 0x68, KEY_6 },
28 { 0x58, KEY_7 },
29 { 0x38, KEY_8 },
30 { 0x78, KEY_9 },
31
32 { 0x10, KEY_L }, /* Live */
33 { 0x08, KEY_TIME }, /* Time Shift */
34
35 { 0x18, KEY_PLAYPAUSE }, /* Play */
36
37 { 0x24, KEY_ENTER }, /* 11 */
38 { 0x64, KEY_ESC }, /* 12 */
39 { 0x04, KEY_M }, /* Multi */
40
41 { 0x54, KEY_VIDEO },
42 { 0x34, KEY_CHANNELUP },
43 { 0x74, KEY_VOLUMEUP },
44 { 0x14, KEY_MUTE },
45
46 { 0x4c, KEY_VCR }, /* SVIDEO */
47 { 0x2c, KEY_CHANNELDOWN },
48 { 0x6c, KEY_VOLUMEDOWN },
49 { 0x0c, KEY_ZOOM },
50
51 { 0x5c, KEY_PAUSE },
52 { 0x3c, KEY_RED }, /* || (red) */
53 { 0x7c, KEY_RECORD }, /* recording */
54 { 0x1c, KEY_STOP },
55
56 { 0x41, KEY_REWIND }, /* backward << */
57 { 0x21, KEY_PLAY },
58 { 0x61, KEY_FASTFORWARD }, /* forward >> */
59 { 0x01, KEY_NEXT }, /* skip >| */
60};
61DEFINE_LEGACY_IR_KEYTABLE(iodata_bctv7e);
62#else
63DECLARE_IR_KEYTABLE(iodata_bctv7e);
64#endif
diff --git a/include/media/keycodes/kaiomy.h b/include/media/keycodes/kaiomy.h
deleted file mode 100644
index 2d6dbbc073a..00000000000
--- a/include/media/keycodes/kaiomy.h
+++ /dev/null
@@ -1,63 +0,0 @@
1/* kaiomy.h - Keytable for kaiomy Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Kaiomy TVnPC U2
12 Mauro Carvalho Chehab <mchehab@infradead.org>
13 */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode kaiomy[] = {
17 { 0x43, KEY_POWER2},
18 { 0x01, KEY_LIST},
19 { 0x0b, KEY_ZOOM},
20 { 0x03, KEY_POWER},
21
22 { 0x04, KEY_1},
23 { 0x08, KEY_2},
24 { 0x02, KEY_3},
25
26 { 0x0f, KEY_4},
27 { 0x05, KEY_5},
28 { 0x06, KEY_6},
29
30 { 0x0c, KEY_7},
31 { 0x0d, KEY_8},
32 { 0x0a, KEY_9},
33
34 { 0x11, KEY_0},
35
36 { 0x09, KEY_CHANNELUP},
37 { 0x07, KEY_CHANNELDOWN},
38
39 { 0x0e, KEY_VOLUMEUP},
40 { 0x13, KEY_VOLUMEDOWN},
41
42 { 0x10, KEY_HOME},
43 { 0x12, KEY_ENTER},
44
45 { 0x14, KEY_RECORD},
46 { 0x15, KEY_STOP},
47 { 0x16, KEY_PLAY},
48 { 0x17, KEY_MUTE},
49
50 { 0x18, KEY_UP},
51 { 0x19, KEY_DOWN},
52 { 0x1a, KEY_LEFT},
53 { 0x1b, KEY_RIGHT},
54
55 { 0x1c, KEY_RED},
56 { 0x1d, KEY_GREEN},
57 { 0x1e, KEY_YELLOW},
58 { 0x1f, KEY_BLUE},
59};
60DEFINE_LEGACY_IR_KEYTABLE(kaiomy);
61#else
62DECLARE_IR_KEYTABLE(kaiomy);
63#endif
diff --git a/include/media/keycodes/kworld-315u.h b/include/media/keycodes/kworld-315u.h
deleted file mode 100644
index 44e29b61cb6..00000000000
--- a/include/media/keycodes/kworld-315u.h
+++ /dev/null
@@ -1,59 +0,0 @@
1/* kworld-315u.h - Keytable for kworld_315u Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Kworld 315U
12 */
13
14#ifdef IR_KEYMAPS
15static struct ir_scancode kworld_315u[] = {
16 { 0x6143, KEY_POWER },
17 { 0x6101, KEY_TUNER }, /* source */
18 { 0x610b, KEY_ZOOM },
19 { 0x6103, KEY_POWER2 }, /* shutdown */
20
21 { 0x6104, KEY_1 },
22 { 0x6108, KEY_2 },
23 { 0x6102, KEY_3 },
24 { 0x6109, KEY_CHANNELUP },
25
26 { 0x610f, KEY_4 },
27 { 0x6105, KEY_5 },
28 { 0x6106, KEY_6 },
29 { 0x6107, KEY_CHANNELDOWN },
30
31 { 0x610c, KEY_7 },
32 { 0x610d, KEY_8 },
33 { 0x610a, KEY_9 },
34 { 0x610e, KEY_VOLUMEUP },
35
36 { 0x6110, KEY_LAST },
37 { 0x6111, KEY_0 },
38 { 0x6112, KEY_ENTER },
39 { 0x6113, KEY_VOLUMEDOWN },
40
41 { 0x6114, KEY_RECORD },
42 { 0x6115, KEY_STOP },
43 { 0x6116, KEY_PLAY },
44 { 0x6117, KEY_MUTE },
45
46 { 0x6118, KEY_UP },
47 { 0x6119, KEY_DOWN },
48 { 0x611a, KEY_LEFT },
49 { 0x611b, KEY_RIGHT },
50
51 { 0x611c, KEY_RED },
52 { 0x611d, KEY_GREEN },
53 { 0x611e, KEY_YELLOW },
54 { 0x611f, KEY_BLUE },
55};
56DEFINE_IR_KEYTABLE(kworld_315u, IR_TYPE_NEC);
57#else
58DECLARE_IR_KEYTABLE(kworld_315u);
59#endif
diff --git a/include/media/keycodes/kworld-plus-tv-analog.h b/include/media/keycodes/kworld-plus-tv-analog.h
deleted file mode 100644
index 2b4ae0b75e5..00000000000
--- a/include/media/keycodes/kworld-plus-tv-analog.h
+++ /dev/null
@@ -1,75 +0,0 @@
1/* kworld-plus-tv-analog.h - Keytable for kworld_plus_tv_analog Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Kworld Plus TV Analog Lite PCI IR
12 Mauro Carvalho Chehab <mchehab@infradead.org>
13 */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode kworld_plus_tv_analog[] = {
17 { 0x0c, KEY_PROG1 }, /* Kworld key */
18 { 0x16, KEY_CLOSECD }, /* -> ) */
19 { 0x1d, KEY_POWER2 },
20
21 { 0x00, KEY_1 },
22 { 0x01, KEY_2 },
23 { 0x02, KEY_3 }, /* Two keys have the same code: 3 and left */
24 { 0x03, KEY_4 }, /* Two keys have the same code: 3 and right */
25 { 0x04, KEY_5 },
26 { 0x05, KEY_6 },
27 { 0x06, KEY_7 },
28 { 0x07, KEY_8 },
29 { 0x08, KEY_9 },
30 { 0x0a, KEY_0 },
31
32 { 0x09, KEY_AGAIN },
33 { 0x14, KEY_MUTE },
34
35 { 0x20, KEY_UP },
36 { 0x21, KEY_DOWN },
37 { 0x0b, KEY_ENTER },
38
39 { 0x10, KEY_CHANNELUP },
40 { 0x11, KEY_CHANNELDOWN },
41
42 /* Couldn't map key left/key right since those
43 conflict with '3' and '4' scancodes
44 I dunno what the original driver does
45 */
46
47 { 0x13, KEY_VOLUMEUP },
48 { 0x12, KEY_VOLUMEDOWN },
49
50 /* The lower part of the IR
51 There are several duplicated keycodes there.
52 Most of them conflict with digits.
53 Add mappings just to the unused scancodes.
54 Somehow, the original driver has a way to know,
55 but this doesn't seem to be on some GPIO.
56 Also, it is not related to the time between keyup
57 and keydown.
58 */
59 { 0x19, KEY_TIME}, /* Timeshift */
60 { 0x1a, KEY_STOP},
61 { 0x1b, KEY_RECORD},
62
63 { 0x22, KEY_TEXT},
64
65 { 0x15, KEY_AUDIO}, /* ((*)) */
66 { 0x0f, KEY_ZOOM},
67 { 0x1c, KEY_CAMERA}, /* snapshot */
68
69 { 0x18, KEY_RED}, /* B */
70 { 0x23, KEY_GREEN}, /* C */
71};
72DEFINE_LEGACY_IR_KEYTABLE(kworld_plus_tv_analog);
73#else
74DECLARE_IR_KEYTABLE(kworld_plus_tv_analog);
75#endif
diff --git a/include/media/keycodes/manli.h b/include/media/keycodes/manli.h
deleted file mode 100644
index 9f8e752505c..00000000000
--- a/include/media/keycodes/manli.h
+++ /dev/null
@@ -1,111 +0,0 @@
1/* manli.h - Keytable for manli Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Michael Tokarev <mjt@tls.msk.ru>
12 http://www.corpit.ru/mjt/beholdTV/remote_control.jpg
13 keytable is used by MANLI MTV00[0x0c] and BeholdTV 40[13] at
14 least, and probably other cards too.
15 The "ascii-art picture" below (in comments, first row
16 is the keycode in hex, and subsequent row(s) shows
17 the button labels (several variants when appropriate)
18 helps to descide which keycodes to assign to the buttons.
19 */
20
21#ifdef IR_KEYMAPS
22static struct ir_scancode manli[] = {
23
24 /* 0x1c 0x12 *
25 * FUNCTION POWER *
26 * FM (|) *
27 * */
28 { 0x1c, KEY_RADIO }, /*XXX*/
29 { 0x12, KEY_POWER },
30
31 /* 0x01 0x02 0x03 *
32 * 1 2 3 *
33 * *
34 * 0x04 0x05 0x06 *
35 * 4 5 6 *
36 * *
37 * 0x07 0x08 0x09 *
38 * 7 8 9 *
39 * */
40 { 0x01, KEY_1 },
41 { 0x02, KEY_2 },
42 { 0x03, KEY_3 },
43 { 0x04, KEY_4 },
44 { 0x05, KEY_5 },
45 { 0x06, KEY_6 },
46 { 0x07, KEY_7 },
47 { 0x08, KEY_8 },
48 { 0x09, KEY_9 },
49
50 /* 0x0a 0x00 0x17 *
51 * RECALL 0 +100 *
52 * PLUS *
53 * */
54 { 0x0a, KEY_AGAIN }, /*XXX KEY_REWIND? */
55 { 0x00, KEY_0 },
56 { 0x17, KEY_DIGITS }, /*XXX*/
57
58 /* 0x14 0x10 *
59 * MENU INFO *
60 * OSD */
61 { 0x14, KEY_MENU },
62 { 0x10, KEY_INFO },
63
64 /* 0x0b *
65 * Up *
66 * *
67 * 0x18 0x16 0x0c *
68 * Left Ok Right *
69 * *
70 * 0x015 *
71 * Down *
72 * */
73 { 0x0b, KEY_UP },
74 { 0x18, KEY_LEFT },
75 { 0x16, KEY_OK }, /*XXX KEY_SELECT? KEY_ENTER? */
76 { 0x0c, KEY_RIGHT },
77 { 0x15, KEY_DOWN },
78
79 /* 0x11 0x0d *
80 * TV/AV MODE *
81 * SOURCE STEREO *
82 * */
83 { 0x11, KEY_TV }, /*XXX*/
84 { 0x0d, KEY_MODE }, /*XXX there's no KEY_STEREO */
85
86 /* 0x0f 0x1b 0x1a *
87 * AUDIO Vol+ Chan+ *
88 * TIMESHIFT??? *
89 * *
90 * 0x0e 0x1f 0x1e *
91 * SLEEP Vol- Chan- *
92 * */
93 { 0x0f, KEY_AUDIO },
94 { 0x1b, KEY_VOLUMEUP },
95 { 0x1a, KEY_CHANNELUP },
96 { 0x0e, KEY_TIME },
97 { 0x1f, KEY_VOLUMEDOWN },
98 { 0x1e, KEY_CHANNELDOWN },
99
100 /* 0x13 0x19 *
101 * MUTE SNAPSHOT*
102 * */
103 { 0x13, KEY_MUTE },
104 { 0x19, KEY_CAMERA },
105
106 /* 0x1d unused ? */
107};
108DEFINE_LEGACY_IR_KEYTABLE(manli);
109#else
110DECLARE_IR_KEYTABLE(manli);
111#endif
diff --git a/include/media/keycodes/msi-tvanywhere-plus.h b/include/media/keycodes/msi-tvanywhere-plus.h
deleted file mode 100644
index c5e51ad5597..00000000000
--- a/include/media/keycodes/msi-tvanywhere-plus.h
+++ /dev/null
@@ -1,100 +0,0 @@
1/* msi-tvanywhere-plus.h - Keytable for msi_tvanywhere_plus Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/*
12 Keycodes for remote on the MSI TV@nywhere Plus. The controller IC on the card
13 is marked "KS003". The controller is I2C at address 0x30, but does not seem
14 to respond to probes until a read is performed from a valid device.
15 I don't know why...
16
17 Note: This remote may be of similar or identical design to the
18 Pixelview remote (?). The raw codes and duplicate button codes
19 appear to be the same.
20
21 Henry Wong <henry@stuffedcow.net>
22 Some changes to formatting and keycodes by Mark Schultz <n9xmj@yahoo.com>
23
24*/
25
26#ifdef IR_KEYMAPS
27static struct ir_scancode msi_tvanywhere_plus[] = {
28
29/* ---- Remote Button Layout ----
30
31 POWER SOURCE SCAN MUTE
32 TV/FM 1 2 3
33 |> 4 5 6
34 <| 7 8 9
35 ^^UP 0 + RECALL
36 vvDN RECORD STOP PLAY
37
38 MINIMIZE ZOOM
39
40 CH+
41 VOL- VOL+
42 CH-
43
44 SNAPSHOT MTS
45
46 << FUNC >> RESET
47*/
48
49 { 0x01, KEY_1 }, /* 1 */
50 { 0x0b, KEY_2 }, /* 2 */
51 { 0x1b, KEY_3 }, /* 3 */
52 { 0x05, KEY_4 }, /* 4 */
53 { 0x09, KEY_5 }, /* 5 */
54 { 0x15, KEY_6 }, /* 6 */
55 { 0x06, KEY_7 }, /* 7 */
56 { 0x0a, KEY_8 }, /* 8 */
57 { 0x12, KEY_9 }, /* 9 */
58 { 0x02, KEY_0 }, /* 0 */
59 { 0x10, KEY_KPPLUS }, /* + */
60 { 0x13, KEY_AGAIN }, /* Recall */
61
62 { 0x1e, KEY_POWER }, /* Power */
63 { 0x07, KEY_TUNER }, /* Source */
64 { 0x1c, KEY_SEARCH }, /* Scan */
65 { 0x18, KEY_MUTE }, /* Mute */
66
67 { 0x03, KEY_RADIO }, /* TV/FM */
68 /* The next four keys are duplicates that appear to send the
69 same IR code as Ch+, Ch-, >>, and << . The raw code assigned
70 to them is the actual code + 0x20 - they will never be
71 detected as such unless some way is discovered to distinguish
72 these buttons from those that have the same code. */
73 { 0x3f, KEY_RIGHT }, /* |> and Ch+ */
74 { 0x37, KEY_LEFT }, /* <| and Ch- */
75 { 0x2c, KEY_UP }, /* ^^Up and >> */
76 { 0x24, KEY_DOWN }, /* vvDn and << */
77
78 { 0x00, KEY_RECORD }, /* Record */
79 { 0x08, KEY_STOP }, /* Stop */
80 { 0x11, KEY_PLAY }, /* Play */
81
82 { 0x0f, KEY_CLOSE }, /* Minimize */
83 { 0x19, KEY_ZOOM }, /* Zoom */
84 { 0x1a, KEY_CAMERA }, /* Snapshot */
85 { 0x0d, KEY_LANGUAGE }, /* MTS */
86
87 { 0x14, KEY_VOLUMEDOWN }, /* Vol- */
88 { 0x16, KEY_VOLUMEUP }, /* Vol+ */
89 { 0x17, KEY_CHANNELDOWN }, /* Ch- */
90 { 0x1f, KEY_CHANNELUP }, /* Ch+ */
91
92 { 0x04, KEY_REWIND }, /* << */
93 { 0x0e, KEY_MENU }, /* Function */
94 { 0x0c, KEY_FASTFORWARD }, /* >> */
95 { 0x1d, KEY_RESTART }, /* Reset */
96};
97DEFINE_LEGACY_IR_KEYTABLE(msi_tvanywhere_plus);
98#else
99DECLARE_IR_KEYTABLE(msi_tvanywhere_plus);
100#endif
diff --git a/include/media/keycodes/msi-tvanywhere.h b/include/media/keycodes/msi-tvanywhere.h
deleted file mode 100644
index 2f4cfe100ab..00000000000
--- a/include/media/keycodes/msi-tvanywhere.h
+++ /dev/null
@@ -1,44 +0,0 @@
1/* msi-tvanywhere.h - Keytable for msi_tvanywhere Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode msi_tvanywhere[] = {
14 /* Keys 0 to 9 */
15 { 0x00, KEY_0 },
16 { 0x01, KEY_1 },
17 { 0x02, KEY_2 },
18 { 0x03, KEY_3 },
19 { 0x04, KEY_4 },
20 { 0x05, KEY_5 },
21 { 0x06, KEY_6 },
22 { 0x07, KEY_7 },
23 { 0x08, KEY_8 },
24 { 0x09, KEY_9 },
25
26 { 0x0c, KEY_MUTE },
27 { 0x0f, KEY_SCREEN }, /* Full Screen */
28 { 0x10, KEY_FN }, /* Funtion */
29 { 0x11, KEY_TIME }, /* Time shift */
30 { 0x12, KEY_POWER },
31 { 0x13, KEY_MEDIA }, /* MTS */
32 { 0x14, KEY_SLOW },
33 { 0x16, KEY_REWIND }, /* backward << */
34 { 0x17, KEY_ENTER }, /* Return */
35 { 0x18, KEY_FASTFORWARD }, /* forward >> */
36 { 0x1a, KEY_CHANNELUP },
37 { 0x1b, KEY_VOLUMEUP },
38 { 0x1e, KEY_CHANNELDOWN },
39 { 0x1f, KEY_VOLUMEDOWN },
40};
41DEFINE_LEGACY_IR_KEYTABLE(msi_tvanywhere);
42#else
43DECLARE_IR_KEYTABLE(msi_tvanywhere);
44#endif
diff --git a/include/media/keycodes/nebula.h b/include/media/keycodes/nebula.h
deleted file mode 100644
index 4e2eb1f1368..00000000000
--- a/include/media/keycodes/nebula.h
+++ /dev/null
@@ -1,73 +0,0 @@
1/* nebula.h - Keytable for nebula Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode nebula[] = {
14 { 0x00, KEY_0 },
15 { 0x01, KEY_1 },
16 { 0x02, KEY_2 },
17 { 0x03, KEY_3 },
18 { 0x04, KEY_4 },
19 { 0x05, KEY_5 },
20 { 0x06, KEY_6 },
21 { 0x07, KEY_7 },
22 { 0x08, KEY_8 },
23 { 0x09, KEY_9 },
24 { 0x0a, KEY_TV },
25 { 0x0b, KEY_AUX },
26 { 0x0c, KEY_DVD },
27 { 0x0d, KEY_POWER },
28 { 0x0e, KEY_MHP }, /* labelled 'Picture' */
29 { 0x0f, KEY_AUDIO },
30 { 0x10, KEY_INFO },
31 { 0x11, KEY_F13 }, /* 16:9 */
32 { 0x12, KEY_F14 }, /* 14:9 */
33 { 0x13, KEY_EPG },
34 { 0x14, KEY_EXIT },
35 { 0x15, KEY_MENU },
36 { 0x16, KEY_UP },
37 { 0x17, KEY_DOWN },
38 { 0x18, KEY_LEFT },
39 { 0x19, KEY_RIGHT },
40 { 0x1a, KEY_ENTER },
41 { 0x1b, KEY_CHANNELUP },
42 { 0x1c, KEY_CHANNELDOWN },
43 { 0x1d, KEY_VOLUMEUP },
44 { 0x1e, KEY_VOLUMEDOWN },
45 { 0x1f, KEY_RED },
46 { 0x20, KEY_GREEN },
47 { 0x21, KEY_YELLOW },
48 { 0x22, KEY_BLUE },
49 { 0x23, KEY_SUBTITLE },
50 { 0x24, KEY_F15 }, /* AD */
51 { 0x25, KEY_TEXT },
52 { 0x26, KEY_MUTE },
53 { 0x27, KEY_REWIND },
54 { 0x28, KEY_STOP },
55 { 0x29, KEY_PLAY },
56 { 0x2a, KEY_FASTFORWARD },
57 { 0x2b, KEY_F16 }, /* chapter */
58 { 0x2c, KEY_PAUSE },
59 { 0x2d, KEY_PLAY },
60 { 0x2e, KEY_RECORD },
61 { 0x2f, KEY_F17 }, /* picture in picture */
62 { 0x30, KEY_KPPLUS }, /* zoom in */
63 { 0x31, KEY_KPMINUS }, /* zoom out */
64 { 0x32, KEY_F18 }, /* capture */
65 { 0x33, KEY_F19 }, /* web */
66 { 0x34, KEY_EMAIL },
67 { 0x35, KEY_PHONE },
68 { 0x36, KEY_PC },
69};
70DEFINE_LEGACY_IR_KEYTABLE(nebula);
71#else
72DECLARE_IR_KEYTABLE(nebula);
73#endif
diff --git a/include/media/keycodes/nec-terratec-cinergy-xs.h b/include/media/keycodes/nec-terratec-cinergy-xs.h
deleted file mode 100644
index 39ede1ebc76..00000000000
--- a/include/media/keycodes/nec-terratec-cinergy-xs.h
+++ /dev/null
@@ -1,81 +0,0 @@
1/* nec-terratec-cinergy-xs.h - Keytable for nec_terratec_cinergy_xs Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Terratec Cinergy Hybrid T USB XS FM
12 Mauro Carvalho Chehab <mchehab@redhat.com>
13 */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode nec_terratec_cinergy_xs[] = {
17 { 0x1441, KEY_HOME},
18 { 0x1401, KEY_POWER2},
19
20 { 0x1442, KEY_MENU}, /* DVD menu */
21 { 0x1443, KEY_SUBTITLE},
22 { 0x1444, KEY_TEXT}, /* Teletext */
23 { 0x1445, KEY_DELETE},
24
25 { 0x1402, KEY_1},
26 { 0x1403, KEY_2},
27 { 0x1404, KEY_3},
28 { 0x1405, KEY_4},
29 { 0x1406, KEY_5},
30 { 0x1407, KEY_6},
31 { 0x1408, KEY_7},
32 { 0x1409, KEY_8},
33 { 0x140a, KEY_9},
34 { 0x140c, KEY_0},
35
36 { 0x140b, KEY_TUNER}, /* AV */
37 { 0x140d, KEY_MODE}, /* A.B */
38
39 { 0x1446, KEY_TV},
40 { 0x1447, KEY_DVD},
41 { 0x1449, KEY_VIDEO},
42 { 0x144a, KEY_RADIO}, /* Music */
43 { 0x144b, KEY_CAMERA}, /* PIC */
44
45 { 0x1410, KEY_UP},
46 { 0x1411, KEY_LEFT},
47 { 0x1412, KEY_OK},
48 { 0x1413, KEY_RIGHT},
49 { 0x1414, KEY_DOWN},
50
51 { 0x140f, KEY_EPG},
52 { 0x1416, KEY_INFO},
53 { 0x144d, KEY_BACKSPACE},
54
55 { 0x141c, KEY_VOLUMEUP},
56 { 0x141e, KEY_VOLUMEDOWN},
57
58 { 0x144c, KEY_PLAY},
59 { 0x141d, KEY_MUTE},
60
61 { 0x141b, KEY_CHANNELUP},
62 { 0x141f, KEY_CHANNELDOWN},
63
64 { 0x1417, KEY_RED},
65 { 0x1418, KEY_GREEN},
66 { 0x1419, KEY_YELLOW},
67 { 0x141a, KEY_BLUE},
68
69 { 0x1458, KEY_RECORD},
70 { 0x1448, KEY_STOP},
71 { 0x1440, KEY_PAUSE},
72
73 { 0x1454, KEY_LAST},
74 { 0x144e, KEY_REWIND},
75 { 0x144f, KEY_FASTFORWARD},
76 { 0x145c, KEY_NEXT},
77};
78DEFINE_IR_KEYTABLE(nec_terratec_cinergy_xs, IR_TYPE_NEC);
79#else
80DECLARE_IR_KEYTABLE(nec_terratec_cinergy_xs);
81#endif
diff --git a/include/media/keycodes/norwood.h b/include/media/keycodes/norwood.h
deleted file mode 100644
index 7f6cc4c243e..00000000000
--- a/include/media/keycodes/norwood.h
+++ /dev/null
@@ -1,61 +0,0 @@
1/* norwood.h - Keytable for norwood Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Norwood Micro (non-Pro) TV Tuner
12 By Peter Naulls <peter@chocky.org>
13 Key comments are the functions given in the manual */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode norwood[] = {
17 /* Keys 0 to 9 */
18 { 0x20, KEY_0 },
19 { 0x21, KEY_1 },
20 { 0x22, KEY_2 },
21 { 0x23, KEY_3 },
22 { 0x24, KEY_4 },
23 { 0x25, KEY_5 },
24 { 0x26, KEY_6 },
25 { 0x27, KEY_7 },
26 { 0x28, KEY_8 },
27 { 0x29, KEY_9 },
28
29 { 0x78, KEY_TUNER }, /* Video Source */
30 { 0x2c, KEY_EXIT }, /* Open/Close software */
31 { 0x2a, KEY_SELECT }, /* 2 Digit Select */
32 { 0x69, KEY_AGAIN }, /* Recall */
33
34 { 0x32, KEY_BRIGHTNESSUP }, /* Brightness increase */
35 { 0x33, KEY_BRIGHTNESSDOWN }, /* Brightness decrease */
36 { 0x6b, KEY_KPPLUS }, /* (not named >>>>>) */
37 { 0x6c, KEY_KPMINUS }, /* (not named <<<<<) */
38
39 { 0x2d, KEY_MUTE }, /* Mute */
40 { 0x30, KEY_VOLUMEUP }, /* Volume up */
41 { 0x31, KEY_VOLUMEDOWN }, /* Volume down */
42 { 0x60, KEY_CHANNELUP }, /* Channel up */
43 { 0x61, KEY_CHANNELDOWN }, /* Channel down */
44
45 { 0x3f, KEY_RECORD }, /* Record */
46 { 0x37, KEY_PLAY }, /* Play */
47 { 0x36, KEY_PAUSE }, /* Pause */
48 { 0x2b, KEY_STOP }, /* Stop */
49 { 0x67, KEY_FASTFORWARD }, /* Foward */
50 { 0x66, KEY_REWIND }, /* Rewind */
51 { 0x3e, KEY_SEARCH }, /* Auto Scan */
52 { 0x2e, KEY_CAMERA }, /* Capture Video */
53 { 0x6d, KEY_MENU }, /* Show/Hide Control */
54 { 0x2f, KEY_ZOOM }, /* Full Screen */
55 { 0x34, KEY_RADIO }, /* FM */
56 { 0x65, KEY_POWER }, /* Computer power */
57};
58DEFINE_LEGACY_IR_KEYTABLE(norwood);
59#else
60DECLARE_IR_KEYTABLE(norwood);
61#endif
diff --git a/include/media/keycodes/npgtech.h b/include/media/keycodes/npgtech.h
deleted file mode 100644
index dd1ba828181..00000000000
--- a/include/media/keycodes/npgtech.h
+++ /dev/null
@@ -1,57 +0,0 @@
1/* npgtech.h - Keytable for npgtech Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode npgtech[] = {
14 { 0x1d, KEY_SWITCHVIDEOMODE }, /* switch inputs */
15 { 0x2a, KEY_FRONT },
16
17 { 0x3e, KEY_1 },
18 { 0x02, KEY_2 },
19 { 0x06, KEY_3 },
20 { 0x0a, KEY_4 },
21 { 0x0e, KEY_5 },
22 { 0x12, KEY_6 },
23 { 0x16, KEY_7 },
24 { 0x1a, KEY_8 },
25 { 0x1e, KEY_9 },
26 { 0x3a, KEY_0 },
27 { 0x22, KEY_NUMLOCK }, /* -/-- */
28 { 0x20, KEY_REFRESH },
29
30 { 0x03, KEY_BRIGHTNESSDOWN },
31 { 0x28, KEY_AUDIO },
32 { 0x3c, KEY_CHANNELUP },
33 { 0x3f, KEY_VOLUMEDOWN },
34 { 0x2e, KEY_MUTE },
35 { 0x3b, KEY_VOLUMEUP },
36 { 0x00, KEY_CHANNELDOWN },
37 { 0x07, KEY_BRIGHTNESSUP },
38 { 0x2c, KEY_TEXT },
39
40 { 0x37, KEY_RECORD },
41 { 0x17, KEY_PLAY },
42 { 0x13, KEY_PAUSE },
43 { 0x26, KEY_STOP },
44 { 0x18, KEY_FASTFORWARD },
45 { 0x14, KEY_REWIND },
46 { 0x33, KEY_ZOOM },
47 { 0x32, KEY_KEYBOARD },
48 { 0x30, KEY_GOTO }, /* Pointing arrow */
49 { 0x36, KEY_MACRO }, /* Maximize/Minimize (yellow) */
50 { 0x0b, KEY_RADIO },
51 { 0x10, KEY_POWER },
52
53};
54DEFINE_LEGACY_IR_KEYTABLE(npgtech);
55#else
56DECLARE_IR_KEYTABLE(npgtech);
57#endif
diff --git a/include/media/keycodes/pctv-sedna.h b/include/media/keycodes/pctv-sedna.h
deleted file mode 100644
index b1d511f2f56..00000000000
--- a/include/media/keycodes/pctv-sedna.h
+++ /dev/null
@@ -1,56 +0,0 @@
1/* pctv-sedna.h - Keytable for pctv_sedna Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Mapping for the 28 key remote control as seen at
12 http://www.sednacomputer.com/photo/cardbus-tv.jpg
13 Pavel Mihaylov <bin@bash.info>
14 Also for the remote bundled with Kozumi KTV-01C card */
15
16#ifdef IR_KEYMAPS
17static struct ir_scancode pctv_sedna[] = {
18 { 0x00, KEY_0 },
19 { 0x01, KEY_1 },
20 { 0x02, KEY_2 },
21 { 0x03, KEY_3 },
22 { 0x04, KEY_4 },
23 { 0x05, KEY_5 },
24 { 0x06, KEY_6 },
25 { 0x07, KEY_7 },
26 { 0x08, KEY_8 },
27 { 0x09, KEY_9 },
28
29 { 0x0a, KEY_AGAIN }, /* Recall */
30 { 0x0b, KEY_CHANNELUP },
31 { 0x0c, KEY_VOLUMEUP },
32 { 0x0d, KEY_MODE }, /* Stereo */
33 { 0x0e, KEY_STOP },
34 { 0x0f, KEY_PREVIOUSSONG },
35 { 0x10, KEY_ZOOM },
36 { 0x11, KEY_TUNER }, /* Source */
37 { 0x12, KEY_POWER },
38 { 0x13, KEY_MUTE },
39 { 0x15, KEY_CHANNELDOWN },
40 { 0x18, KEY_VOLUMEDOWN },
41 { 0x19, KEY_CAMERA }, /* Snapshot */
42 { 0x1a, KEY_NEXTSONG },
43 { 0x1b, KEY_TIME }, /* Time Shift */
44 { 0x1c, KEY_RADIO }, /* FM Radio */
45 { 0x1d, KEY_RECORD },
46 { 0x1e, KEY_PAUSE },
47 /* additional codes for Kozumi's remote */
48 { 0x14, KEY_INFO }, /* OSD */
49 { 0x16, KEY_OK }, /* OK */
50 { 0x17, KEY_DIGITS }, /* Plus */
51 { 0x1f, KEY_PLAY }, /* Play */
52};
53DEFINE_LEGACY_IR_KEYTABLE(pctv_sedna);
54#else
55DECLARE_IR_KEYTABLE(pctv_sedna);
56#endif
diff --git a/include/media/keycodes/pinnacle-color.h b/include/media/keycodes/pinnacle-color.h
deleted file mode 100644
index a08eaeb7406..00000000000
--- a/include/media/keycodes/pinnacle-color.h
+++ /dev/null
@@ -1,71 +0,0 @@
1/* pinnacle-color.h - Keytable for pinnacle_color Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode pinnacle_color[] = {
14 { 0x59, KEY_MUTE },
15 { 0x4a, KEY_POWER },
16
17 { 0x18, KEY_TEXT },
18 { 0x26, KEY_TV },
19 { 0x3d, KEY_PRINT },
20
21 { 0x48, KEY_RED },
22 { 0x04, KEY_GREEN },
23 { 0x11, KEY_YELLOW },
24 { 0x00, KEY_BLUE },
25
26 { 0x2d, KEY_VOLUMEUP },
27 { 0x1e, KEY_VOLUMEDOWN },
28
29 { 0x49, KEY_MENU },
30
31 { 0x16, KEY_CHANNELUP },
32 { 0x17, KEY_CHANNELDOWN },
33
34 { 0x20, KEY_UP },
35 { 0x21, KEY_DOWN },
36 { 0x22, KEY_LEFT },
37 { 0x23, KEY_RIGHT },
38 { 0x0d, KEY_SELECT },
39
40 { 0x08, KEY_BACK },
41 { 0x07, KEY_REFRESH },
42
43 { 0x2f, KEY_ZOOM },
44 { 0x29, KEY_RECORD },
45
46 { 0x4b, KEY_PAUSE },
47 { 0x4d, KEY_REWIND },
48 { 0x2e, KEY_PLAY },
49 { 0x4e, KEY_FORWARD },
50 { 0x53, KEY_PREVIOUS },
51 { 0x4c, KEY_STOP },
52 { 0x54, KEY_NEXT },
53
54 { 0x69, KEY_0 },
55 { 0x6a, KEY_1 },
56 { 0x6b, KEY_2 },
57 { 0x6c, KEY_3 },
58 { 0x6d, KEY_4 },
59 { 0x6e, KEY_5 },
60 { 0x6f, KEY_6 },
61 { 0x70, KEY_7 },
62 { 0x71, KEY_8 },
63 { 0x72, KEY_9 },
64
65 { 0x74, KEY_CHANNEL },
66 { 0x0a, KEY_BACKSPACE },
67};
68DEFINE_LEGACY_IR_KEYTABLE(pinnacle_color);
69#else
70DECLARE_IR_KEYTABLE(pinnacle_color);
71#endif
diff --git a/include/media/keycodes/pinnacle-grey.h b/include/media/keycodes/pinnacle-grey.h
deleted file mode 100644
index 3fd250483ce..00000000000
--- a/include/media/keycodes/pinnacle-grey.h
+++ /dev/null
@@ -1,66 +0,0 @@
1/* pinnacle-grey.h - Keytable for pinnacle_grey Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode pinnacle_grey[] = {
14 { 0x3a, KEY_0 },
15 { 0x31, KEY_1 },
16 { 0x32, KEY_2 },
17 { 0x33, KEY_3 },
18 { 0x34, KEY_4 },
19 { 0x35, KEY_5 },
20 { 0x36, KEY_6 },
21 { 0x37, KEY_7 },
22 { 0x38, KEY_8 },
23 { 0x39, KEY_9 },
24
25 { 0x2f, KEY_POWER },
26
27 { 0x2e, KEY_P },
28 { 0x1f, KEY_L },
29 { 0x2b, KEY_I },
30
31 { 0x2d, KEY_SCREEN },
32 { 0x1e, KEY_ZOOM },
33 { 0x1b, KEY_VOLUMEUP },
34 { 0x0f, KEY_VOLUMEDOWN },
35 { 0x17, KEY_CHANNELUP },
36 { 0x1c, KEY_CHANNELDOWN },
37 { 0x25, KEY_INFO },
38
39 { 0x3c, KEY_MUTE },
40
41 { 0x3d, KEY_LEFT },
42 { 0x3b, KEY_RIGHT },
43
44 { 0x3f, KEY_UP },
45 { 0x3e, KEY_DOWN },
46 { 0x1a, KEY_ENTER },
47
48 { 0x1d, KEY_MENU },
49 { 0x19, KEY_AGAIN },
50 { 0x16, KEY_PREVIOUSSONG },
51 { 0x13, KEY_NEXTSONG },
52 { 0x15, KEY_PAUSE },
53 { 0x0e, KEY_REWIND },
54 { 0x0d, KEY_PLAY },
55 { 0x0b, KEY_STOP },
56 { 0x07, KEY_FORWARD },
57 { 0x27, KEY_RECORD },
58 { 0x26, KEY_TUNER },
59 { 0x29, KEY_TEXT },
60 { 0x2a, KEY_MEDIA },
61 { 0x18, KEY_EPG },
62};
63DEFINE_LEGACY_IR_KEYTABLE(pinnacle_grey);
64#else
65DECLARE_IR_KEYTABLE(pinnacle_grey);
66#endif
diff --git a/include/media/keycodes/pinnacle-pctv-hd.h b/include/media/keycodes/pinnacle-pctv-hd.h
deleted file mode 100644
index be72d50269d..00000000000
--- a/include/media/keycodes/pinnacle-pctv-hd.h
+++ /dev/null
@@ -1,49 +0,0 @@
1/* pinnacle-pctv-hd.h - Keytable for pinnacle_pctv_hd Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Pinnacle PCTV HD 800i mini remote */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode pinnacle_pctv_hd[] = {
15
16 { 0x0f, KEY_1 },
17 { 0x15, KEY_2 },
18 { 0x10, KEY_3 },
19 { 0x18, KEY_4 },
20 { 0x1b, KEY_5 },
21 { 0x1e, KEY_6 },
22 { 0x11, KEY_7 },
23 { 0x21, KEY_8 },
24 { 0x12, KEY_9 },
25 { 0x27, KEY_0 },
26
27 { 0x24, KEY_ZOOM },
28 { 0x2a, KEY_SUBTITLE },
29
30 { 0x00, KEY_MUTE },
31 { 0x01, KEY_ENTER }, /* Pinnacle Logo */
32 { 0x39, KEY_POWER },
33
34 { 0x03, KEY_VOLUMEUP },
35 { 0x09, KEY_VOLUMEDOWN },
36 { 0x06, KEY_CHANNELUP },
37 { 0x0c, KEY_CHANNELDOWN },
38
39 { 0x2d, KEY_REWIND },
40 { 0x30, KEY_PLAYPAUSE },
41 { 0x33, KEY_FASTFORWARD },
42 { 0x3c, KEY_STOP },
43 { 0x36, KEY_RECORD },
44 { 0x3f, KEY_EPG }, /* Labeled "?" */
45};
46DEFINE_LEGACY_IR_KEYTABLE(pinnacle_pctv_hd);
47#else
48DECLARE_IR_KEYTABLE(pinnacle_pctv_hd);
49#endif
diff --git a/include/media/keycodes/pixelview-new.h b/include/media/keycodes/pixelview-new.h
deleted file mode 100644
index 76ed0c35752..00000000000
--- a/include/media/keycodes/pixelview-new.h
+++ /dev/null
@@ -1,59 +0,0 @@
1/* pixelview-new.h - Keytable for pixelview_new Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/*
12 Mauro Carvalho Chehab <mchehab@infradead.org>
13 present on PV MPEG 8000GT
14 */
15
16#ifdef IR_KEYMAPS
17static struct ir_scancode pixelview_new[] = {
18 { 0x3c, KEY_TIME }, /* Timeshift */
19 { 0x12, KEY_POWER },
20
21 { 0x3d, KEY_1 },
22 { 0x38, KEY_2 },
23 { 0x18, KEY_3 },
24 { 0x35, KEY_4 },
25 { 0x39, KEY_5 },
26 { 0x15, KEY_6 },
27 { 0x36, KEY_7 },
28 { 0x3a, KEY_8 },
29 { 0x1e, KEY_9 },
30 { 0x3e, KEY_0 },
31
32 { 0x1c, KEY_AGAIN }, /* LOOP */
33 { 0x3f, KEY_MEDIA }, /* Source */
34 { 0x1f, KEY_LAST }, /* +100 */
35 { 0x1b, KEY_MUTE },
36
37 { 0x17, KEY_CHANNELDOWN },
38 { 0x16, KEY_CHANNELUP },
39 { 0x10, KEY_VOLUMEUP },
40 { 0x14, KEY_VOLUMEDOWN },
41 { 0x13, KEY_ZOOM },
42
43 { 0x19, KEY_CAMERA }, /* SNAPSHOT */
44 { 0x1a, KEY_SEARCH }, /* scan */
45
46 { 0x37, KEY_REWIND }, /* << */
47 { 0x32, KEY_RECORD }, /* o (red) */
48 { 0x33, KEY_FORWARD }, /* >> */
49 { 0x11, KEY_STOP }, /* square */
50 { 0x3b, KEY_PLAY }, /* > */
51 { 0x30, KEY_PLAYPAUSE }, /* || */
52
53 { 0x31, KEY_TV },
54 { 0x34, KEY_RADIO },
55};
56DEFINE_LEGACY_IR_KEYTABLE(pixelview_new);
57#else
58DECLARE_IR_KEYTABLE(pixelview_new);
59#endif
diff --git a/include/media/keycodes/pixelview.h b/include/media/keycodes/pixelview.h
deleted file mode 100644
index e048277db89..00000000000
--- a/include/media/keycodes/pixelview.h
+++ /dev/null
@@ -1,59 +0,0 @@
1/* pixelview.h - Keytable for pixelview Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode pixelview[] = {
14
15 { 0x1e, KEY_POWER }, /* power */
16 { 0x07, KEY_MEDIA }, /* source */
17 { 0x1c, KEY_SEARCH }, /* scan */
18
19
20 { 0x03, KEY_TUNER }, /* TV/FM */
21
22 { 0x00, KEY_RECORD },
23 { 0x08, KEY_STOP },
24 { 0x11, KEY_PLAY },
25
26 { 0x1a, KEY_PLAYPAUSE }, /* freeze */
27 { 0x19, KEY_ZOOM }, /* zoom */
28 { 0x0f, KEY_TEXT }, /* min */
29
30 { 0x01, KEY_1 },
31 { 0x0b, KEY_2 },
32 { 0x1b, KEY_3 },
33 { 0x05, KEY_4 },
34 { 0x09, KEY_5 },
35 { 0x15, KEY_6 },
36 { 0x06, KEY_7 },
37 { 0x0a, KEY_8 },
38 { 0x12, KEY_9 },
39 { 0x02, KEY_0 },
40 { 0x10, KEY_LAST }, /* +100 */
41 { 0x13, KEY_LIST }, /* recall */
42
43 { 0x1f, KEY_CHANNELUP }, /* chn down */
44 { 0x17, KEY_CHANNELDOWN }, /* chn up */
45 { 0x16, KEY_VOLUMEUP }, /* vol down */
46 { 0x14, KEY_VOLUMEDOWN }, /* vol up */
47
48 { 0x04, KEY_KPMINUS }, /* <<< */
49 { 0x0e, KEY_SETUP }, /* function */
50 { 0x0c, KEY_KPPLUS }, /* >>> */
51
52 { 0x0d, KEY_GOTO }, /* mts */
53 { 0x1d, KEY_REFRESH }, /* reset */
54 { 0x18, KEY_MUTE }, /* mute/unmute */
55};
56DEFINE_LEGACY_IR_KEYTABLE(pixelview);
57#else
58DECLARE_IR_KEYTABLE(pixelview);
59#endif
diff --git a/include/media/keycodes/powercolor-real-angel.h b/include/media/keycodes/powercolor-real-angel.h
deleted file mode 100644
index 098c4a992bf..00000000000
--- a/include/media/keycodes/powercolor-real-angel.h
+++ /dev/null
@@ -1,57 +0,0 @@
1/* powercolor-real-angel.h - Keytable for powercolor_real_angel Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/*
12 * Remote control for Powercolor Real Angel 330
13 * Daniel Fraga <fragabr@gmail.com>
14 */
15
16#ifdef IR_KEYMAPS
17static struct ir_scancode powercolor_real_angel[] = {
18 { 0x38, KEY_SWITCHVIDEOMODE }, /* switch inputs */
19 { 0x0c, KEY_MEDIA }, /* Turn ON/OFF App */
20 { 0x00, KEY_0 },
21 { 0x01, KEY_1 },
22 { 0x02, KEY_2 },
23 { 0x03, KEY_3 },
24 { 0x04, KEY_4 },
25 { 0x05, KEY_5 },
26 { 0x06, KEY_6 },
27 { 0x07, KEY_7 },
28 { 0x08, KEY_8 },
29 { 0x09, KEY_9 },
30 { 0x0a, KEY_DIGITS }, /* single, double, tripple digit */
31 { 0x29, KEY_PREVIOUS }, /* previous channel */
32 { 0x12, KEY_BRIGHTNESSUP },
33 { 0x13, KEY_BRIGHTNESSDOWN },
34 { 0x2b, KEY_MODE }, /* stereo/mono */
35 { 0x2c, KEY_TEXT }, /* teletext */
36 { 0x20, KEY_CHANNELUP }, /* channel up */
37 { 0x21, KEY_CHANNELDOWN }, /* channel down */
38 { 0x10, KEY_VOLUMEUP }, /* volume up */
39 { 0x11, KEY_VOLUMEDOWN }, /* volume down */
40 { 0x0d, KEY_MUTE },
41 { 0x1f, KEY_RECORD },
42 { 0x17, KEY_PLAY },
43 { 0x16, KEY_PAUSE },
44 { 0x0b, KEY_STOP },
45 { 0x27, KEY_FASTFORWARD },
46 { 0x26, KEY_REWIND },
47 { 0x1e, KEY_SEARCH }, /* autoscan */
48 { 0x0e, KEY_CAMERA }, /* snapshot */
49 { 0x2d, KEY_SETUP },
50 { 0x0f, KEY_SCREEN }, /* full screen */
51 { 0x14, KEY_RADIO }, /* FM radio */
52 { 0x25, KEY_POWER }, /* power */
53};
54DEFINE_LEGACY_IR_KEYTABLE(powercolor_real_angel);
55#else
56DECLARE_IR_KEYTABLE(powercolor_real_angel);
57#endif
diff --git a/include/media/keycodes/proteus-2309.h b/include/media/keycodes/proteus-2309.h
deleted file mode 100644
index 1993702ca55..00000000000
--- a/include/media/keycodes/proteus-2309.h
+++ /dev/null
@@ -1,45 +0,0 @@
1/* proteus-2309.h - Keytable for proteus_2309 Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Michal Majchrowicz <mmajchrowicz@gmail.com> */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode proteus_2309[] = {
15 /* numeric */
16 { 0x00, KEY_0 },
17 { 0x01, KEY_1 },
18 { 0x02, KEY_2 },
19 { 0x03, KEY_3 },
20 { 0x04, KEY_4 },
21 { 0x05, KEY_5 },
22 { 0x06, KEY_6 },
23 { 0x07, KEY_7 },
24 { 0x08, KEY_8 },
25 { 0x09, KEY_9 },
26
27 { 0x5c, KEY_POWER }, /* power */
28 { 0x20, KEY_ZOOM }, /* full screen */
29 { 0x0f, KEY_BACKSPACE }, /* recall */
30 { 0x1b, KEY_ENTER }, /* mute */
31 { 0x41, KEY_RECORD }, /* record */
32 { 0x43, KEY_STOP }, /* stop */
33 { 0x16, KEY_S },
34 { 0x1a, KEY_POWER2 }, /* off */
35 { 0x2e, KEY_RED },
36 { 0x1f, KEY_CHANNELDOWN }, /* channel - */
37 { 0x1c, KEY_CHANNELUP }, /* channel + */
38 { 0x10, KEY_VOLUMEDOWN }, /* volume - */
39 { 0x1e, KEY_VOLUMEUP }, /* volume + */
40 { 0x14, KEY_F1 },
41};
42DEFINE_LEGACY_IR_KEYTABLE(proteus_2309);
43#else
44DECLARE_IR_KEYTABLE(proteus_2309);
45#endif
diff --git a/include/media/keycodes/purpletv.h b/include/media/keycodes/purpletv.h
deleted file mode 100644
index 14962649a92..00000000000
--- a/include/media/keycodes/purpletv.h
+++ /dev/null
@@ -1,58 +0,0 @@
1/* purpletv.h - Keytable for purpletv Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode purpletv[] = {
14 { 0x03, KEY_POWER },
15 { 0x6f, KEY_MUTE },
16 { 0x10, KEY_BACKSPACE }, /* Recall */
17
18 { 0x11, KEY_0 },
19 { 0x04, KEY_1 },
20 { 0x05, KEY_2 },
21 { 0x06, KEY_3 },
22 { 0x08, KEY_4 },
23 { 0x09, KEY_5 },
24 { 0x0a, KEY_6 },
25 { 0x0c, KEY_7 },
26 { 0x0d, KEY_8 },
27 { 0x0e, KEY_9 },
28 { 0x12, KEY_DOT }, /* 100+ */
29
30 { 0x07, KEY_VOLUMEUP },
31 { 0x0b, KEY_VOLUMEDOWN },
32 { 0x1a, KEY_KPPLUS },
33 { 0x18, KEY_KPMINUS },
34 { 0x15, KEY_UP },
35 { 0x1d, KEY_DOWN },
36 { 0x0f, KEY_CHANNELUP },
37 { 0x13, KEY_CHANNELDOWN },
38 { 0x48, KEY_ZOOM },
39
40 { 0x1b, KEY_VIDEO }, /* Video source */
41 { 0x1f, KEY_CAMERA }, /* Snapshot */
42 { 0x49, KEY_LANGUAGE }, /* MTS Select */
43 { 0x19, KEY_SEARCH }, /* Auto Scan */
44
45 { 0x4b, KEY_RECORD },
46 { 0x46, KEY_PLAY },
47 { 0x45, KEY_PAUSE }, /* Pause */
48 { 0x44, KEY_STOP },
49 { 0x43, KEY_TIME }, /* Time Shift */
50 { 0x17, KEY_CHANNEL }, /* SURF CH */
51 { 0x40, KEY_FORWARD }, /* Forward ? */
52 { 0x42, KEY_REWIND }, /* Backward ? */
53
54};
55DEFINE_LEGACY_IR_KEYTABLE(purpletv);
56#else
57DECLARE_IR_KEYTABLE(purpletv);
58#endif
diff --git a/include/media/keycodes/pv951.h b/include/media/keycodes/pv951.h
deleted file mode 100644
index 33a8bf7b908..00000000000
--- a/include/media/keycodes/pv951.h
+++ /dev/null
@@ -1,54 +0,0 @@
1/* pv951.h - Keytable for pv951 Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Mark Phalan <phalanm@o2.ie> */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode pv951[] = {
15 { 0x00, KEY_0 },
16 { 0x01, KEY_1 },
17 { 0x02, KEY_2 },
18 { 0x03, KEY_3 },
19 { 0x04, KEY_4 },
20 { 0x05, KEY_5 },
21 { 0x06, KEY_6 },
22 { 0x07, KEY_7 },
23 { 0x08, KEY_8 },
24 { 0x09, KEY_9 },
25
26 { 0x12, KEY_POWER },
27 { 0x10, KEY_MUTE },
28 { 0x1f, KEY_VOLUMEDOWN },
29 { 0x1b, KEY_VOLUMEUP },
30 { 0x1a, KEY_CHANNELUP },
31 { 0x1e, KEY_CHANNELDOWN },
32 { 0x0e, KEY_PAGEUP },
33 { 0x1d, KEY_PAGEDOWN },
34 { 0x13, KEY_SOUND },
35
36 { 0x18, KEY_KPPLUSMINUS }, /* CH +/- */
37 { 0x16, KEY_SUBTITLE }, /* CC */
38 { 0x0d, KEY_TEXT }, /* TTX */
39 { 0x0b, KEY_TV }, /* AIR/CBL */
40 { 0x11, KEY_PC }, /* PC/TV */
41 { 0x17, KEY_OK }, /* CH RTN */
42 { 0x19, KEY_MODE }, /* FUNC */
43 { 0x0c, KEY_SEARCH }, /* AUTOSCAN */
44
45 /* Not sure what to do with these ones! */
46 { 0x0f, KEY_SELECT }, /* SOURCE */
47 { 0x0a, KEY_KPPLUS }, /* +100 */
48 { 0x14, KEY_EQUAL }, /* SYNC */
49 { 0x1c, KEY_MEDIA }, /* PC/TV */
50};
51DEFINE_LEGACY_IR_KEYTABLE(pv951);
52#else
53DECLARE_IR_KEYTABLE(pv951);
54#endif
diff --git a/include/media/keycodes/rc5-hauppauge-new.h b/include/media/keycodes/rc5-hauppauge-new.h
deleted file mode 100644
index f02b59ab4f9..00000000000
--- a/include/media/keycodes/rc5-hauppauge-new.h
+++ /dev/null
@@ -1,79 +0,0 @@
1/* rc5-hauppauge-new.h - Keytable for rc5_hauppauge_new Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/*
12 * Hauppauge:the newer, gray remotes (seems there are multiple
13 * slightly different versions), shipped with cx88+ivtv cards.
14 *
15 * This table contains the complete RC5 code, instead of just the data part
16 */
17
18#ifdef IR_KEYMAPS
19static struct ir_scancode rc5_hauppauge_new[] = {
20 /* Keys 0 to 9 */
21 { 0x1e00, KEY_0 },
22 { 0x1e01, KEY_1 },
23 { 0x1e02, KEY_2 },
24 { 0x1e03, KEY_3 },
25 { 0x1e04, KEY_4 },
26 { 0x1e05, KEY_5 },
27 { 0x1e06, KEY_6 },
28 { 0x1e07, KEY_7 },
29 { 0x1e08, KEY_8 },
30 { 0x1e09, KEY_9 },
31
32 { 0x1e0a, KEY_TEXT }, /* keypad asterisk as well */
33 { 0x1e0b, KEY_RED }, /* red button */
34 { 0x1e0c, KEY_RADIO },
35 { 0x1e0d, KEY_MENU },
36 { 0x1e0e, KEY_SUBTITLE }, /* also the # key */
37 { 0x1e0f, KEY_MUTE },
38 { 0x1e10, KEY_VOLUMEUP },
39 { 0x1e11, KEY_VOLUMEDOWN },
40 { 0x1e12, KEY_PREVIOUS }, /* previous channel */
41 { 0x1e14, KEY_UP },
42 { 0x1e15, KEY_DOWN },
43 { 0x1e16, KEY_LEFT },
44 { 0x1e17, KEY_RIGHT },
45 { 0x1e18, KEY_VIDEO }, /* Videos */
46 { 0x1e19, KEY_AUDIO }, /* Music */
47 /* 0x1e1a: Pictures - presume this means
48 "Multimedia Home Platform" -
49 no "PICTURES" key in input.h
50 */
51 { 0x1e1a, KEY_MHP },
52
53 { 0x1e1b, KEY_EPG }, /* Guide */
54 { 0x1e1c, KEY_TV },
55 { 0x1e1e, KEY_NEXTSONG }, /* skip >| */
56 { 0x1e1f, KEY_EXIT }, /* back/exit */
57 { 0x1e20, KEY_CHANNELUP }, /* channel / program + */
58 { 0x1e21, KEY_CHANNELDOWN }, /* channel / program - */
59 { 0x1e22, KEY_CHANNEL }, /* source (old black remote) */
60 { 0x1e24, KEY_PREVIOUSSONG }, /* replay |< */
61 { 0x1e25, KEY_ENTER }, /* OK */
62 { 0x1e26, KEY_SLEEP }, /* minimize (old black remote) */
63 { 0x1e29, KEY_BLUE }, /* blue key */
64 { 0x1e2e, KEY_GREEN }, /* green button */
65 { 0x1e30, KEY_PAUSE }, /* pause */
66 { 0x1e32, KEY_REWIND }, /* backward << */
67 { 0x1e34, KEY_FASTFORWARD }, /* forward >> */
68 { 0x1e35, KEY_PLAY },
69 { 0x1e36, KEY_STOP },
70 { 0x1e37, KEY_RECORD }, /* recording */
71 { 0x1e38, KEY_YELLOW }, /* yellow key */
72 { 0x1e3b, KEY_SELECT }, /* top right button */
73 { 0x1e3c, KEY_ZOOM }, /* full */
74 { 0x1e3d, KEY_POWER }, /* system power (green button) */
75};
76DEFINE_IR_KEYTABLE(rc5_hauppauge_new, IR_TYPE_RC5);
77#else
78DECLARE_IR_KEYTABLE(rc5_hauppauge_new);
79#endif
diff --git a/include/media/keycodes/rc5-tv.h b/include/media/keycodes/rc5-tv.h
deleted file mode 100644
index a429a54e808..00000000000
--- a/include/media/keycodes/rc5-tv.h
+++ /dev/null
@@ -1,57 +0,0 @@
1/* rc5-tv.h - Keytable for rc5_tv Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* generic RC5 keytable */
12/* see http://users.pandora.be/nenya/electronics/rc5/codes00.htm */
13/* used by old (black) Hauppauge remotes */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode rc5_tv[] = {
17 /* Keys 0 to 9 */
18 { 0x00, KEY_0 },
19 { 0x01, KEY_1 },
20 { 0x02, KEY_2 },
21 { 0x03, KEY_3 },
22 { 0x04, KEY_4 },
23 { 0x05, KEY_5 },
24 { 0x06, KEY_6 },
25 { 0x07, KEY_7 },
26 { 0x08, KEY_8 },
27 { 0x09, KEY_9 },
28
29 { 0x0b, KEY_CHANNEL }, /* channel / program (japan: 11) */
30 { 0x0c, KEY_POWER }, /* standby */
31 { 0x0d, KEY_MUTE }, /* mute / demute */
32 { 0x0f, KEY_TV }, /* display */
33 { 0x10, KEY_VOLUMEUP },
34 { 0x11, KEY_VOLUMEDOWN },
35 { 0x12, KEY_BRIGHTNESSUP },
36 { 0x13, KEY_BRIGHTNESSDOWN },
37 { 0x1e, KEY_SEARCH }, /* search + */
38 { 0x20, KEY_CHANNELUP }, /* channel / program + */
39 { 0x21, KEY_CHANNELDOWN }, /* channel / program - */
40 { 0x22, KEY_CHANNEL }, /* alt / channel */
41 { 0x23, KEY_LANGUAGE }, /* 1st / 2nd language */
42 { 0x26, KEY_SLEEP }, /* sleeptimer */
43 { 0x2e, KEY_MENU }, /* 2nd controls (USA: menu) */
44 { 0x30, KEY_PAUSE },
45 { 0x32, KEY_REWIND },
46 { 0x33, KEY_GOTO },
47 { 0x35, KEY_PLAY },
48 { 0x36, KEY_STOP },
49 { 0x37, KEY_RECORD }, /* recording */
50 { 0x3c, KEY_TEXT }, /* teletext submode (Japan: 12) */
51 { 0x3d, KEY_SUSPEND }, /* system standby */
52
53};
54DEFINE_LEGACY_IR_KEYTABLE(rc5_tv);
55#else
56DECLARE_IR_KEYTABLE(rc5_tv);
57#endif
diff --git a/include/media/keycodes/real-audio-220-32-keys.h b/include/media/keycodes/real-audio-220-32-keys.h
deleted file mode 100644
index 5f6835dbe4c..00000000000
--- a/include/media/keycodes/real-audio-220-32-keys.h
+++ /dev/null
@@ -1,54 +0,0 @@
1/* real-audio-220-32-keys.h - Keytable for real_audio_220_32_keys Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Zogis Real Audio 220 - 32 keys IR */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode real_audio_220_32_keys[] = {
15 { 0x1c, KEY_RADIO},
16 { 0x12, KEY_POWER2},
17
18 { 0x01, KEY_1},
19 { 0x02, KEY_2},
20 { 0x03, KEY_3},
21 { 0x04, KEY_4},
22 { 0x05, KEY_5},
23 { 0x06, KEY_6},
24 { 0x07, KEY_7},
25 { 0x08, KEY_8},
26 { 0x09, KEY_9},
27 { 0x00, KEY_0},
28
29 { 0x0c, KEY_VOLUMEUP},
30 { 0x18, KEY_VOLUMEDOWN},
31 { 0x0b, KEY_CHANNELUP},
32 { 0x15, KEY_CHANNELDOWN},
33 { 0x16, KEY_ENTER},
34
35 { 0x11, KEY_LIST}, /* Source */
36 { 0x0d, KEY_AUDIO}, /* stereo */
37
38 { 0x0f, KEY_PREVIOUS}, /* Prev */
39 { 0x1b, KEY_TIME}, /* Timeshift */
40 { 0x1a, KEY_NEXT}, /* Next */
41
42 { 0x0e, KEY_STOP},
43 { 0x1f, KEY_PLAY},
44 { 0x1e, KEY_PLAYPAUSE}, /* Pause */
45
46 { 0x1d, KEY_RECORD},
47 { 0x13, KEY_MUTE},
48 { 0x19, KEY_CAMERA}, /* Snapshot */
49
50};
51DEFINE_LEGACY_IR_KEYTABLE(real_audio_220_32_keys);
52#else
53DECLARE_IR_KEYTABLE(real_audio_220_32_keys);
54#endif
diff --git a/include/media/keycodes/tbs-nec.h b/include/media/keycodes/tbs-nec.h
deleted file mode 100644
index 156985e122a..00000000000
--- a/include/media/keycodes/tbs-nec.h
+++ /dev/null
@@ -1,50 +0,0 @@
1/* tbs-nec.h - Keytable for tbs_nec Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode tbs_nec[] = {
14 { 0x04, KEY_POWER2}, /*power*/
15 { 0x14, KEY_MUTE}, /*mute*/
16 { 0x07, KEY_1},
17 { 0x06, KEY_2},
18 { 0x05, KEY_3},
19 { 0x0b, KEY_4},
20 { 0x0a, KEY_5},
21 { 0x09, KEY_6},
22 { 0x0f, KEY_7},
23 { 0x0e, KEY_8},
24 { 0x0d, KEY_9},
25 { 0x12, KEY_0},
26 { 0x16, KEY_CHANNELUP}, /*ch+*/
27 { 0x11, KEY_CHANNELDOWN},/*ch-*/
28 { 0x13, KEY_VOLUMEUP}, /*vol+*/
29 { 0x0c, KEY_VOLUMEDOWN},/*vol-*/
30 { 0x03, KEY_RECORD}, /*rec*/
31 { 0x18, KEY_PAUSE}, /*pause*/
32 { 0x19, KEY_OK}, /*ok*/
33 { 0x1a, KEY_CAMERA}, /* snapshot */
34 { 0x01, KEY_UP},
35 { 0x10, KEY_LEFT},
36 { 0x02, KEY_RIGHT},
37 { 0x08, KEY_DOWN},
38 { 0x15, KEY_FAVORITES},
39 { 0x17, KEY_SUBTITLE},
40 { 0x1d, KEY_ZOOM},
41 { 0x1f, KEY_EXIT},
42 { 0x1e, KEY_MENU},
43 { 0x1c, KEY_EPG},
44 { 0x00, KEY_PREVIOUS},
45 { 0x1b, KEY_MODE},
46};
47DEFINE_LEGACY_IR_KEYTABLE(tbs_nec);
48#else
49DECLARE_IR_KEYTABLE(tbs_nec);
50#endif
diff --git a/include/media/keycodes/terratec-cinergy-xs.h b/include/media/keycodes/terratec-cinergy-xs.h
deleted file mode 100644
index 8f50fae05d8..00000000000
--- a/include/media/keycodes/terratec-cinergy-xs.h
+++ /dev/null
@@ -1,68 +0,0 @@
1/* terratec-cinergy-xs.h - Keytable for terratec_cinergy_xs Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Terratec Cinergy Hybrid T USB XS
12 Devin Heitmueller <dheitmueller@linuxtv.org>
13 */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode terratec_cinergy_xs[] = {
17 { 0x41, KEY_HOME},
18 { 0x01, KEY_POWER},
19 { 0x42, KEY_MENU},
20 { 0x02, KEY_1},
21 { 0x03, KEY_2},
22 { 0x04, KEY_3},
23 { 0x43, KEY_SUBTITLE},
24 { 0x05, KEY_4},
25 { 0x06, KEY_5},
26 { 0x07, KEY_6},
27 { 0x44, KEY_TEXT},
28 { 0x08, KEY_7},
29 { 0x09, KEY_8},
30 { 0x0a, KEY_9},
31 { 0x45, KEY_DELETE},
32 { 0x0b, KEY_TUNER},
33 { 0x0c, KEY_0},
34 { 0x0d, KEY_MODE},
35 { 0x46, KEY_TV},
36 { 0x47, KEY_DVD},
37 { 0x49, KEY_VIDEO},
38 { 0x4b, KEY_AUX},
39 { 0x10, KEY_UP},
40 { 0x11, KEY_LEFT},
41 { 0x12, KEY_OK},
42 { 0x13, KEY_RIGHT},
43 { 0x14, KEY_DOWN},
44 { 0x0f, KEY_EPG},
45 { 0x16, KEY_INFO},
46 { 0x4d, KEY_BACKSPACE},
47 { 0x1c, KEY_VOLUMEUP},
48 { 0x4c, KEY_PLAY},
49 { 0x1b, KEY_CHANNELUP},
50 { 0x1e, KEY_VOLUMEDOWN},
51 { 0x1d, KEY_MUTE},
52 { 0x1f, KEY_CHANNELDOWN},
53 { 0x17, KEY_RED},
54 { 0x18, KEY_GREEN},
55 { 0x19, KEY_YELLOW},
56 { 0x1a, KEY_BLUE},
57 { 0x58, KEY_RECORD},
58 { 0x48, KEY_STOP},
59 { 0x40, KEY_PAUSE},
60 { 0x54, KEY_LAST},
61 { 0x4e, KEY_REWIND},
62 { 0x4f, KEY_FASTFORWARD},
63 { 0x5c, KEY_NEXT},
64};
65DEFINE_LEGACY_IR_KEYTABLE(terratec_cinergy_xs);
66#else
67DECLARE_IR_KEYTABLE(terratec_cinergy_xs);
68#endif
diff --git a/include/media/keycodes/tevii-nec.h b/include/media/keycodes/tevii-nec.h
deleted file mode 100644
index 6a8ea03a9be..00000000000
--- a/include/media/keycodes/tevii-nec.h
+++ /dev/null
@@ -1,65 +0,0 @@
1/* tevii-nec.h - Keytable for tevii_nec Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode tevii_nec[] = {
14 { 0x0a, KEY_POWER2},
15 { 0x0c, KEY_MUTE},
16 { 0x11, KEY_1},
17 { 0x12, KEY_2},
18 { 0x13, KEY_3},
19 { 0x14, KEY_4},
20 { 0x15, KEY_5},
21 { 0x16, KEY_6},
22 { 0x17, KEY_7},
23 { 0x18, KEY_8},
24 { 0x19, KEY_9},
25 { 0x10, KEY_0},
26 { 0x1c, KEY_MENU},
27 { 0x0f, KEY_VOLUMEDOWN},
28 { 0x1a, KEY_LAST},
29 { 0x0e, KEY_OPEN},
30 { 0x04, KEY_RECORD},
31 { 0x09, KEY_VOLUMEUP},
32 { 0x08, KEY_CHANNELUP},
33 { 0x07, KEY_PVR},
34 { 0x0b, KEY_TIME},
35 { 0x02, KEY_RIGHT},
36 { 0x03, KEY_LEFT},
37 { 0x00, KEY_UP},
38 { 0x1f, KEY_OK},
39 { 0x01, KEY_DOWN},
40 { 0x05, KEY_TUNER},
41 { 0x06, KEY_CHANNELDOWN},
42 { 0x40, KEY_PLAYPAUSE},
43 { 0x1e, KEY_REWIND},
44 { 0x1b, KEY_FAVORITES},
45 { 0x1d, KEY_BACK},
46 { 0x4d, KEY_FASTFORWARD},
47 { 0x44, KEY_EPG},
48 { 0x4c, KEY_INFO},
49 { 0x41, KEY_AB},
50 { 0x43, KEY_AUDIO},
51 { 0x45, KEY_SUBTITLE},
52 { 0x4a, KEY_LIST},
53 { 0x46, KEY_F1},
54 { 0x47, KEY_F2},
55 { 0x5e, KEY_F3},
56 { 0x5c, KEY_F4},
57 { 0x52, KEY_F5},
58 { 0x5a, KEY_F6},
59 { 0x56, KEY_MODE},
60 { 0x58, KEY_SWITCHVIDEOMODE},
61};
62DEFINE_LEGACY_IR_KEYTABLE(tevii_nec);
63#else
64DECLARE_IR_KEYTABLE(tevii_nec);
65#endif
diff --git a/include/media/keycodes/tt-1500.h b/include/media/keycodes/tt-1500.h
deleted file mode 100644
index 45ffcba1737..00000000000
--- a/include/media/keycodes/tt-1500.h
+++ /dev/null
@@ -1,58 +0,0 @@
1/* tt-1500.h - Keytable for tt_1500 Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* for the Technotrend 1500 bundled remotes (grey and black): */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode tt_1500[] = {
15 { 0x01, KEY_POWER },
16 { 0x02, KEY_SHUFFLE }, /* ? double-arrow key */
17 { 0x03, KEY_1 },
18 { 0x04, KEY_2 },
19 { 0x05, KEY_3 },
20 { 0x06, KEY_4 },
21 { 0x07, KEY_5 },
22 { 0x08, KEY_6 },
23 { 0x09, KEY_7 },
24 { 0x0a, KEY_8 },
25 { 0x0b, KEY_9 },
26 { 0x0c, KEY_0 },
27 { 0x0d, KEY_UP },
28 { 0x0e, KEY_LEFT },
29 { 0x0f, KEY_OK },
30 { 0x10, KEY_RIGHT },
31 { 0x11, KEY_DOWN },
32 { 0x12, KEY_INFO },
33 { 0x13, KEY_EXIT },
34 { 0x14, KEY_RED },
35 { 0x15, KEY_GREEN },
36 { 0x16, KEY_YELLOW },
37 { 0x17, KEY_BLUE },
38 { 0x18, KEY_MUTE },
39 { 0x19, KEY_TEXT },
40 { 0x1a, KEY_MODE }, /* ? TV/Radio */
41 { 0x21, KEY_OPTION },
42 { 0x22, KEY_EPG },
43 { 0x23, KEY_CHANNELUP },
44 { 0x24, KEY_CHANNELDOWN },
45 { 0x25, KEY_VOLUMEUP },
46 { 0x26, KEY_VOLUMEDOWN },
47 { 0x27, KEY_SETUP },
48 { 0x3a, KEY_RECORD }, /* these keys are only in the black remote */
49 { 0x3b, KEY_PLAY },
50 { 0x3c, KEY_STOP },
51 { 0x3d, KEY_REWIND },
52 { 0x3e, KEY_PAUSE },
53 { 0x3f, KEY_FORWARD },
54};
55DEFINE_LEGACY_IR_KEYTABLE(tt_1500);
56#else
57DECLARE_IR_KEYTABLE(tt_1500);
58#endif
diff --git a/include/media/keycodes/videomate-s350.h b/include/media/keycodes/videomate-s350.h
deleted file mode 100644
index ff38424b4f6..00000000000
--- a/include/media/keycodes/videomate-s350.h
+++ /dev/null
@@ -1,62 +0,0 @@
1/* videomate-s350.h - Keytable for videomate_s350 Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode videomate_s350[] = {
14 { 0x00, KEY_TV},
15 { 0x01, KEY_DVD},
16 { 0x04, KEY_RECORD},
17 { 0x05, KEY_VIDEO}, /* TV/Video */
18 { 0x07, KEY_STOP},
19 { 0x08, KEY_PLAYPAUSE},
20 { 0x0a, KEY_REWIND},
21 { 0x0f, KEY_FASTFORWARD},
22 { 0x10, KEY_CHANNELUP},
23 { 0x12, KEY_VOLUMEUP},
24 { 0x13, KEY_CHANNELDOWN},
25 { 0x14, KEY_MUTE},
26 { 0x15, KEY_VOLUMEDOWN},
27 { 0x16, KEY_1},
28 { 0x17, KEY_2},
29 { 0x18, KEY_3},
30 { 0x19, KEY_4},
31 { 0x1a, KEY_5},
32 { 0x1b, KEY_6},
33 { 0x1c, KEY_7},
34 { 0x1d, KEY_8},
35 { 0x1e, KEY_9},
36 { 0x1f, KEY_0},
37 { 0x21, KEY_SLEEP},
38 { 0x24, KEY_ZOOM},
39 { 0x25, KEY_LAST}, /* Recall */
40 { 0x26, KEY_SUBTITLE}, /* CC */
41 { 0x27, KEY_LANGUAGE}, /* MTS */
42 { 0x29, KEY_CHANNEL}, /* SURF */
43 { 0x2b, KEY_A},
44 { 0x2c, KEY_B},
45 { 0x2f, KEY_CAMERA}, /* Snapshot */
46 { 0x23, KEY_RADIO},
47 { 0x02, KEY_PREVIOUSSONG},
48 { 0x06, KEY_NEXTSONG},
49 { 0x03, KEY_EPG},
50 { 0x09, KEY_SETUP},
51 { 0x22, KEY_BACKSPACE},
52 { 0x0c, KEY_UP},
53 { 0x0e, KEY_DOWN},
54 { 0x0b, KEY_LEFT},
55 { 0x0d, KEY_RIGHT},
56 { 0x11, KEY_ENTER},
57 { 0x20, KEY_TEXT},
58};
59DEFINE_LEGACY_IR_KEYTABLE(videomate_s350);
60#else
61DECLARE_IR_KEYTABLE(videomate_s350);
62#endif
diff --git a/include/media/keycodes/videomate-tv-pvr.h b/include/media/keycodes/videomate-tv-pvr.h
deleted file mode 100644
index f77375d3ba4..00000000000
--- a/include/media/keycodes/videomate-tv-pvr.h
+++ /dev/null
@@ -1,64 +0,0 @@
1/* videomate-tv-pvr.h - Keytable for videomate_tv_pvr Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11
12#ifdef IR_KEYMAPS
13static struct ir_scancode videomate_tv_pvr[] = {
14 { 0x14, KEY_MUTE },
15 { 0x24, KEY_ZOOM },
16
17 { 0x01, KEY_DVD },
18 { 0x23, KEY_RADIO },
19 { 0x00, KEY_TV },
20
21 { 0x0a, KEY_REWIND },
22 { 0x08, KEY_PLAYPAUSE },
23 { 0x0f, KEY_FORWARD },
24
25 { 0x02, KEY_PREVIOUS },
26 { 0x07, KEY_STOP },
27 { 0x06, KEY_NEXT },
28
29 { 0x0c, KEY_UP },
30 { 0x0e, KEY_DOWN },
31 { 0x0b, KEY_LEFT },
32 { 0x0d, KEY_RIGHT },
33 { 0x11, KEY_OK },
34
35 { 0x03, KEY_MENU },
36 { 0x09, KEY_SETUP },
37 { 0x05, KEY_VIDEO },
38 { 0x22, KEY_CHANNEL },
39
40 { 0x12, KEY_VOLUMEUP },
41 { 0x15, KEY_VOLUMEDOWN },
42 { 0x10, KEY_CHANNELUP },
43 { 0x13, KEY_CHANNELDOWN },
44
45 { 0x04, KEY_RECORD },
46
47 { 0x16, KEY_1 },
48 { 0x17, KEY_2 },
49 { 0x18, KEY_3 },
50 { 0x19, KEY_4 },
51 { 0x1a, KEY_5 },
52 { 0x1b, KEY_6 },
53 { 0x1c, KEY_7 },
54 { 0x1d, KEY_8 },
55 { 0x1e, KEY_9 },
56 { 0x1f, KEY_0 },
57
58 { 0x20, KEY_LANGUAGE },
59 { 0x21, KEY_SLEEP },
60};
61DEFINE_LEGACY_IR_KEYTABLE(videomate_tv_pvr);
62#else
63DECLARE_IR_KEYTABLE(videomate_tv_pvr);
64#endif
diff --git a/include/media/keycodes/winfast-usbii-deluxe.h b/include/media/keycodes/winfast-usbii-deluxe.h
deleted file mode 100644
index 0d2c14f2fed..00000000000
--- a/include/media/keycodes/winfast-usbii-deluxe.h
+++ /dev/null
@@ -1,58 +0,0 @@
1/* winfast-usbii-deluxe.h - Keytable for winfast_usbii_deluxe Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Leadtek Winfast TV USB II Deluxe remote
12 Magnus Alm <magnus.alm@gmail.com>
13 */
14
15#ifdef IR_KEYMAPS
16static struct ir_scancode winfast_usbii_deluxe[] = {
17 { 0x62, KEY_0},
18 { 0x75, KEY_1},
19 { 0x76, KEY_2},
20 { 0x77, KEY_3},
21 { 0x79, KEY_4},
22 { 0x7a, KEY_5},
23 { 0x7b, KEY_6},
24 { 0x7d, KEY_7},
25 { 0x7e, KEY_8},
26 { 0x7f, KEY_9},
27
28 { 0x38, KEY_CAMERA}, /* SNAPSHOT */
29 { 0x37, KEY_RECORD}, /* RECORD */
30 { 0x35, KEY_TIME}, /* TIMESHIFT */
31
32 { 0x74, KEY_VOLUMEUP}, /* VOLUMEUP */
33 { 0x78, KEY_VOLUMEDOWN}, /* VOLUMEDOWN */
34 { 0x64, KEY_MUTE}, /* MUTE */
35
36 { 0x21, KEY_CHANNEL}, /* SURF */
37 { 0x7c, KEY_CHANNELUP}, /* CHANNELUP */
38 { 0x60, KEY_CHANNELDOWN}, /* CHANNELDOWN */
39 { 0x61, KEY_LAST}, /* LAST CHANNEL (RECALL) */
40
41 { 0x72, KEY_VIDEO}, /* INPUT MODES (TV/FM) */
42
43 { 0x70, KEY_POWER2}, /* TV ON/OFF */
44
45 { 0x39, KEY_CYCLEWINDOWS}, /* MINIMIZE (BOSS) */
46 { 0x3a, KEY_NEW}, /* PIP */
47 { 0x73, KEY_ZOOM}, /* FULLSECREEN */
48
49 { 0x66, KEY_INFO}, /* OSD (DISPLAY) */
50
51 { 0x31, KEY_DOT}, /* '.' */
52 { 0x63, KEY_ENTER}, /* ENTER */
53
54};
55DEFINE_LEGACY_IR_KEYTABLE(winfast_usbii_deluxe);
56#else
57DECLARE_IR_KEYTABLE(winfast_usbii_deluxe);
58#endif
diff --git a/include/media/keycodes/winfast.h b/include/media/keycodes/winfast.h
deleted file mode 100644
index 4f42e24efd4..00000000000
--- a/include/media/keycodes/winfast.h
+++ /dev/null
@@ -1,78 +0,0 @@
1/* winfast.h - Keytable for winfast Remote Controller
2 *
3 * Imported from ir-keymaps.c
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11/* Table for Leadtek Winfast Remote Controls - used by both bttv and cx88 */
12
13#ifdef IR_KEYMAPS
14static struct ir_scancode winfast[] = {
15 /* Keys 0 to 9 */
16 { 0x12, KEY_0 },
17 { 0x05, KEY_1 },
18 { 0x06, KEY_2 },
19 { 0x07, KEY_3 },
20 { 0x09, KEY_4 },
21 { 0x0a, KEY_5 },
22 { 0x0b, KEY_6 },
23 { 0x0d, KEY_7 },
24 { 0x0e, KEY_8 },
25 { 0x0f, KEY_9 },
26
27 { 0x00, KEY_POWER },
28 { 0x1b, KEY_AUDIO }, /* Audio Source */
29 { 0x02, KEY_TUNER }, /* TV/FM, not on Y0400052 */
30 { 0x1e, KEY_VIDEO }, /* Video Source */
31 { 0x16, KEY_INFO }, /* Display information */
32 { 0x04, KEY_VOLUMEUP },
33 { 0x08, KEY_VOLUMEDOWN },
34 { 0x0c, KEY_CHANNELUP },
35 { 0x10, KEY_CHANNELDOWN },
36 { 0x03, KEY_ZOOM }, /* fullscreen */
37 { 0x1f, KEY_TEXT }, /* closed caption/teletext */
38 { 0x20, KEY_SLEEP },
39 { 0x29, KEY_CLEAR }, /* boss key */
40 { 0x14, KEY_MUTE },
41 { 0x2b, KEY_RED },
42 { 0x2c, KEY_GREEN },
43 { 0x2d, KEY_YELLOW },
44 { 0x2e, KEY_BLUE },
45 { 0x18, KEY_KPPLUS }, /* fine tune + , not on Y040052 */
46 { 0x19, KEY_KPMINUS }, /* fine tune - , not on Y040052 */
47 { 0x2a, KEY_MEDIA }, /* PIP (Picture in picture */
48 { 0x21, KEY_DOT },
49 { 0x13, KEY_ENTER },
50 { 0x11, KEY_LAST }, /* Recall (last channel */
51 { 0x22, KEY_PREVIOUS },
52 { 0x23, KEY_PLAYPAUSE },
53 { 0x24, KEY_NEXT },
54 { 0x25, KEY_TIME }, /* Time Shifting */
55 { 0x26, KEY_STOP },
56 { 0x27, KEY_RECORD },
57 { 0x28, KEY_SAVE }, /* Screenshot */
58 { 0x2f, KEY_MENU },
59 { 0x30, KEY_CANCEL },
60 { 0x31, KEY_CHANNEL }, /* Channel Surf */
61 { 0x32, KEY_SUBTITLE },
62 { 0x33, KEY_LANGUAGE },
63 { 0x34, KEY_REWIND },
64 { 0x35, KEY_FASTFORWARD },
65 { 0x36, KEY_TV },
66 { 0x37, KEY_RADIO }, /* FM */
67 { 0x38, KEY_DVD },
68
69 { 0x1a, KEY_MODE}, /* change to MCE mode on Y04G0051 */
70 { 0x3e, KEY_F21 }, /* MCE +VOL, on Y04G0033 */
71 { 0x3a, KEY_F22 }, /* MCE -VOL, on Y04G0033 */
72 { 0x3b, KEY_F23 }, /* MCE +CH, on Y04G0033 */
73 { 0x3f, KEY_F24 } /* MCE -CH, on Y04G0033 */
74};
75DEFINE_LEGACY_IR_KEYTABLE(winfast);
76#else
77DECLARE_IR_KEYTABLE(winfast);
78#endif