aboutsummaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-04-02 20:11:45 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 12:56:51 -0300
commitbd7261d3d7dfe61e8bf8945051c1905ba4dba3b5 (patch)
treeb2a8af995e809da87f04b9a783593f936cf29952 /include/media
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>
Diffstat (limited to 'include/media')
-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
66 files changed, 0 insertions, 4111 deletions
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 @@
#include <linux/interrupt.h>
#include <media/ir-core.h>
-#include <media/keycodes/adstech-dvb-t-pci.h>
-#include <media/keycodes/apac-viewcomp.h>
-#include <media/keycodes/asus-pc39.h>
-#include <media/keycodes/ati-tv-wonder-hd-600.h>
-#include <media/keycodes/avermedia-a16d.h>
-#include <media/keycodes/avermedia-cardbus.h>
-#include <media/keycodes/avermedia-dvbt.h>
-#include <media/keycodes/avermedia.h>
-#include <media/keycodes/avermedia-m135a-rm-jx.h>
-#include <media/keycodes/avertv-303.h>
-#include <media/keycodes/behold-columbus.h>
-#include <media/keycodes/behold.h>
-#include <media/keycodes/budget-ci-old.h>
-#include <media/keycodes/cinergy-1400.h>
-#include <media/keycodes/cinergy.h>
-#include <media/keycodes/dm1105-nec.h>
-#include <media/keycodes/dntv-live-dvb-t.h>
-#include <media/keycodes/dntv-live-dvbt-pro.h>
-#include <media/keycodes/empty.h>
-#include <media/keycodes/em-terratec.h>
-#include <media/keycodes/encore-enltv2.h>
-#include <media/keycodes/encore-enltv-fm53.h>
-#include <media/keycodes/encore-enltv.h>
-#include <media/keycodes/evga-indtube.h>
-#include <media/keycodes/eztv.h>
-#include <media/keycodes/flydvb.h>
-#include <media/keycodes/flyvideo.h>
-#include <media/keycodes/fusionhdtv-mce.h>
-#include <media/keycodes/gadmei-rm008z.h>
-#include <media/keycodes/genius-tvgo-a11mce.h>
-#include <media/keycodes/gotview7135.h>
-#include <media/keycodes/hauppauge-new.h>
-#include <media/keycodes/iodata-bctv7e.h>
-#include <media/keycodes/kaiomy.h>
-#include <media/keycodes/kworld-315u.h>
-#include <media/keycodes/kworld-plus-tv-analog.h>
-#include <media/keycodes/manli.h>
-#include <media/keycodes/msi-tvanywhere.h>
-#include <media/keycodes/msi-tvanywhere-plus.h>
-#include <media/keycodes/nebula.h>
-#include <media/keycodes/nec-terratec-cinergy-xs.h>
-#include <media/keycodes/norwood.h>
-#include <media/keycodes/npgtech.h>
-#include <media/keycodes/pctv-sedna.h>
-#include <media/keycodes/pinnacle-color.h>
-#include <media/keycodes/pinnacle-grey.h>
-#include <media/keycodes/pinnacle-pctv-hd.h>
-#include <media/keycodes/pixelview.h>
-#include <media/keycodes/pixelview-new.h>
-#include <media/keycodes/powercolor-real-angel.h>
-#include <media/keycodes/proteus-2309.h>
-#include <media/keycodes/purpletv.h>
-#include <media/keycodes/pv951.h>
-#include <media/keycodes/rc5-hauppauge-new.h>
-#include <media/keycodes/rc5-tv.h>
-#include <media/keycodes/real-audio-220-32-keys.h>
-#include <media/keycodes/tbs-nec.h>
-#include <media/keycodes/terratec-cinergy-xs.h>
-#include <media/keycodes/tevii-nec.h>
-#include <media/keycodes/tt-1500.h>
-#include <media/keycodes/videomate-s350.h>
-#include <media/keycodes/videomate-tv-pvr.h>
-#include <media/keycodes/winfast.h>
-#include <media/keycodes/winfast-usbii-deluxe.h>
-
#define RC5_START(x) (((x)>>12)&3)
#define RC5_TOGGLE(x) (((x)>>11)&1)
#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 {
#define to_ir_input_dev(_attr) container_of(_attr, struct ir_input_dev, attr)
-#define IR_KEYTABLE(a) \
-ir_codes_ ## a ## _table
-
-#define DECLARE_IR_KEYTABLE(a) \
-extern struct ir_scancode_table IR_KEYTABLE(a)
-
-#define DEFINE_IR_KEYTABLE(tabname, type) \
-struct ir_scancode_table IR_KEYTABLE(tabname) = { \
- .scan = tabname, \
- .size = ARRAY_SIZE(tabname), \
- .ir_type = type, \
- .name = #tabname, \
-}; \
-EXPORT_SYMBOL_GPL(IR_KEYTABLE(tabname))
-
-#define DEFINE_LEGACY_IR_KEYTABLE(tabname) \
- DEFINE_IR_KEYTABLE(tabname, IR_TYPE_UNKNOWN)
-
/* Routines from rc-map.c */
int 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 @@
-/* adstech-dvb-t-pci.h - Keytable for adstech_dvb_t_pci Remote Controller
- *
- * Imported from ir-keymaps.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-/* ADS Tech Instant TV DVB-T PCI Remote */
-
-#ifdef IR_KEYMAPS
-static struct ir_scancode adstech_dvb_t_pci[] = {
- /* Keys 0 to 9 */
- { 0x4d, KEY_0 },
- { 0x57, KEY_1 },
- { 0x4f, KEY_2 },
- { 0x53, KEY_3 },
- { 0x56, KEY_4 },
- { 0x4e, KEY_5 },
- { 0x5e, KEY_6 },
- { 0x54, KEY_7 },
- { 0x4c, KEY_8 },
- { 0x5c, KEY_9 },
-
- { 0x5b, KEY_POWER },
- { 0x5f, KEY_MUTE },
- { 0x55, KEY_GOTO },
- { 0x5d, KEY_SEARCH },
- { 0x17, KEY_EPG }, /* Guide */
- { 0x1f, KEY_MENU },
- { 0x0f, KEY_UP },
- { 0x46, KEY_DOWN },
- { 0x16, KEY_LEFT },
- { 0x1e, KEY_RIGHT },
- { 0x0e, KEY_SELECT }, /* Enter */
- { 0x5a, KEY_INFO },
- { 0x52, KEY_EXIT },
- { 0x59, KEY_PREVIOUS },
- { 0x51, KEY_NEXT },
- { 0x58, KEY_REWIND },
- { 0x50, KEY_FORWARD },
- { 0x44, KEY_PLAYPAUSE },
- { 0x07, KEY_STOP },
- { 0x1b, KEY_RECORD },
- { 0x13, KEY_TUNER }, /* Live */
- { 0x0a, KEY_A },
- { 0x12, KEY_B },
- { 0x03, KEY_PROG1 }, /* 1 */
- { 0x01, KEY_PROG2 }, /* 2 */
- { 0x00, KEY_PROG3 }, /* 3 */
- { 0x06, KEY_DVD },
- { 0x48, KEY_AUX }, /* Photo */
- { 0x40, KEY_VIDEO },
- { 0x19, KEY_AUDIO }, /* Music */
- { 0x0b, KEY_CHANNELUP },
- { 0x08, KEY_CHANNELDOWN },
- { 0x15, KEY_VOLUMEUP },
- { 0x1c, KEY_VOLUMEDOWN },
-};
-DEFINE_LEGACY_IR_KEYTABLE(adstech_dvb_t_pci);
-#else
-DECLARE_IR_KEYTABLE(adstech_dvb_t_pci);
-#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 @@
-/* apac-viewcomp.h - Keytable for apac_viewcomp Remote Controller
- *
- * Imported from ir-keymaps.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-/* Attila Kondoros <attila.kondoros@chello.hu> */
-
-#ifdef IR_KEYMAPS
-static struct ir_scancode apac_viewcomp[] = {
-
- { 0x01, KEY_1 },
- { 0x02, KEY_2 },
- { 0x03, KEY_3 },
- { 0x04, KEY_4 },
- { 0x05, KEY_5 },
- { 0x06, KEY_6 },
- { 0x07, KEY_7 },
- { 0x08, KEY_8 },
- { 0x09, KEY_9 },
- { 0x00, KEY_0 },
- { 0x17, KEY_LAST }, /* +100 */
- { 0x0a, KEY_LIST }, /* recall */
-
-
- { 0x1c, KEY_TUNER }, /* TV/FM */
- { 0x15, KEY_SEARCH }, /* scan */
- { 0x12, KEY_POWER }, /* power */
- { 0x1f, KEY_VOLUMEDOWN }, /* vol up */
- { 0x1b, KEY_VOLUMEUP }, /* vol down */
- { 0x1e, KEY_CHANNELDOWN }, /* chn up */
- { 0x1a, KEY_CHANNELUP }, /* chn down */
-
- { 0x11, KEY_VIDEO }, /* video */
- { 0x0f, KEY_ZOOM }, /* full screen */
- { 0x13, KEY_MUTE }, /* mute/unmute */
- { 0x10, KEY_TEXT }, /* min */
-
- { 0x0d, KEY_STOP }, /* freeze */
- { 0x0e, KEY_RECORD }, /* record */
- { 0x1d, KEY_PLAYPAUSE }, /* stop */
- { 0x19, KEY_PLAY }, /* play */
-
- { 0x16, KEY_GOTO }, /* osd */
- { 0x14, KEY_REFRESH }, /* default */
- { 0x0c, KEY_KPPLUS }, /* fine tune >>>> */
- { 0x18, KEY_KPMINUS }, /* fine tune <<<< */
-};
-DEFINE_LEGACY_IR_KEYTABLE(apac_viewcomp);
-#else
-DECLARE_IR_KEYTABLE(apac_viewcomp);
-#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 @@
-/* asus-pc39.h - Keytable for asus_pc39 Remote Controller
- *
- * Imported from ir-keymaps.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-/*
- * Marc Fargas <telenieko@telenieko.com>
- * this is the remote control that comes with the asus p7131
- * which has a label saying is "Model PC-39"
- */
-
-#ifdef IR_KEYMAPS
-static struct ir_scancode asus_pc39[] = {
- /* Keys 0 to 9 */
- { 0x15, KEY_0 },
- { 0x29, KEY_1 },
- { 0x2d, KEY_2 },
- { 0x2b, KEY_3 },
- { 0x09, KEY_4 },
- { 0x0d, KEY_5 },
- { 0x0b, KEY_6 },
- { 0x31, KEY_7 },
- { 0x35, KEY_8 },
- { 0x33, KEY_9 },
-
- { 0x3e, KEY_RADIO }, /* radio */
- { 0x03, KEY_MENU }, /* dvd/menu */
- { 0x2a, KEY_VOLUMEUP },
- { 0x19, KEY_VOLUMEDOWN },
- { 0x37, KEY_UP },
- { 0x3b, KEY_DOWN },
- { 0x27, KEY_LEFT },
- { 0x2f, KEY_RIGHT },
- { 0x25, KEY_VIDEO }, /* video */
- { 0x39, KEY_AUDIO }, /* music */
-
- { 0x21, KEY_TV }, /* tv */
- { 0x1d, KEY_EXIT }, /* back */
- { 0x0a, KEY_CHANNELUP }, /* channel / program + */
- { 0x1b, KEY_CHANNELDOWN }, /* channel / program - */
- { 0x1a, KEY_ENTER }, /* enter */
-
- { 0x06, KEY_PAUSE }, /* play/pause */
- { 0x1e, KEY_PREVIOUS }, /* rew */
- { 0x26, KEY_NEXT }, /* forward */
- { 0x0e, KEY_REWIND }, /* backward << */
- { 0x3a, KEY_FASTFORWARD }, /* forward >> */
- { 0x36, KEY_STOP },
- { 0x2e, KEY_RECORD }, /* recording */
- { 0x16, KEY_POWER }, /* the button that reads "close" */
-
- { 0x11, KEY_ZOOM }, /* full screen */
- { 0x13, KEY_MACRO }, /* recall */
- { 0x23, KEY_HOME }, /* home */
- { 0x05, KEY_PVR }, /* picture */
- { 0x3d, KEY_MUTE }, /* mute */
- { 0x01, KEY_DVD }, /* dvd */
-};
-DEFINE_LEGACY_IR_KEYTABLE(asus_pc39);
-#else
-DECLARE_IR_KEYTABLE(asus_pc39);
-#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 @@
-/* ati-tv-wonder-hd-600.h - Keytable for ati_tv_wonder_hd_600 Remote Controller
- *
- * Imported from ir-keymaps.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-/* ATI TV Wonder HD 600 USB
- Devin Heitmueller <devin.heitmueller@gmail.com>
- */
-
-#ifdef IR_KEYMAPS
-static struct ir_scancode ati_tv_wonder_hd_600[] = {
- { 0x00, KEY_RECORD}, /* Row 1 */
- { 0x01, KEY_PLAYPAUSE},
- { 0x02, KEY_STOP},
- { 0x03, KEY_POWER},
- { 0x04, KEY_PREVIOUS}, /* Row 2 */
- { 0x05, KEY_REWIND},
- { 0x06, KEY_FORWARD},
- { 0x07, KEY_NEXT},
- { 0x08, KEY_EPG}, /* Row 3 */
- { 0x09, KEY_HOME},
- { 0x0a, KEY_MENU},
- { 0x0b, KEY_CHANNELUP},
- { 0x0c, KEY_BACK}, /* Row 4 */
- { 0x0d, KEY_UP},
- { 0x0e, KEY_INFO},
- { 0x0f, KEY_CHANNELDOWN},
- { 0x10, KEY_LEFT}, /* Row 5 */
- { 0x11, KEY_SELECT},
- { 0x12, KEY_RIGHT},
- { 0x13, KEY_VOLUMEUP},
- { 0x14, KEY_LAST}, /* Row 6 */
- { 0x15, KEY_DOWN},
- { 0x16, KEY_MUTE},
- { 0x17, KEY_VOLUMEDOWN},
-};
-DEFINE_LEGACY_IR_KEYTABLE(ati_tv_wonder_hd_600);
-#else
-DECLARE_IR_KEYTABLE(ati_tv_wonder_hd_600);
-#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 @@
-/* avermedia-a16d.h - Keytable for avermedia_a16d Remote Controller
- *
- * Imported from ir-keymaps.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-
-#ifdef IR_KEYMAPS
-static struct ir_scancode avermedia_a16d[] = {
- { 0x20, KEY_LIST},
- { 0x00, KEY_POWER},
- { 0x28, KEY_1},
- { 0x18, KEY_2},
- { 0x38, KEY_3},
- { 0x24, KEY_4},
- { 0x14, KEY_5},
- { 0x34, KEY_6},
- { 0x2c, KEY_7},
- { 0x1c, KEY_8},
- { 0x3c, KEY_9},
- { 0x12, KEY_SUBTITLE},
- { 0x22, KEY_0},
- { 0x32, KEY_REWIND},
- { 0x3a, KEY_SHUFFLE},
- { 0x02, KEY_PRINT},
- { 0x11, KEY_CHANNELDOWN},
- { 0x31, KEY_CHANNELUP},
- { 0x0c, KEY_ZOOM},
- { 0x1e, KEY_VOLUMEDOWN},
- { 0x3e, KEY_VOLUMEUP},
- { 0x0a, KEY_MUTE},
- { 0x04, KEY_AUDIO},
- { 0x26, KEY_RECORD},
- { 0x06, KEY_PLAY},
- { 0x36, KEY_STOP},
- { 0x16, KEY_PAUSE},
- { 0x2e, KEY_REWIND},
- { 0x0e, KEY_FASTFORWARD},
- { 0x30, KEY_TEXT},
- { 0x21, KEY_GREEN},
- { 0x01, KEY_BLUE},
- { 0x08, KEY_EPG},
- { 0x2a, KEY_MENU},
-};
-DEFINE_LEGACY_IR_KEYTABLE(avermedia_a16d);
-#else
-DECLARE_IR_KEYTABLE(avermedia_a16d);
-#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 @@
-/* avermedia-cardbus.h - Keytable for avermedia_cardbus Remote Controller
- *
- * Imported from ir-keymaps.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-/* Oldrich Jedlicka <oldium.pro@seznam.cz> */
-
-#ifdef IR_KEYMAPS
-static struct ir_scancode avermedia_cardbus[] = {
- { 0x00, KEY_POWER },
- { 0x01, KEY_TUNER }, /* TV/FM */
- { 0x03, KEY_TEXT }, /* Teletext */
- { 0x04, KEY_EPG },
- { 0x05, KEY_1 },
- { 0x06, KEY_2 },
- { 0x07, KEY_3 },
- { 0x08, KEY_AUDIO },
- { 0x09, KEY_4 },
- { 0x0a, KEY_5 },
- { 0x0b, KEY_6 },
- { 0x0c, KEY_ZOOM }, /* Full screen */
- { 0x0d, KEY_7 },
- { 0x0e, KEY_8 },
- { 0x0f, KEY_9 },
- { 0x10, KEY_PAGEUP }, /* 16-CH PREV */
- { 0x11, KEY_0 },
- { 0x12, KEY_INFO },
- { 0x13, KEY_AGAIN }, /* CH RTN - channel return */
- { 0x14, KEY_MUTE },
- { 0x15, KEY_EDIT }, /* Autoscan */
- { 0x17, KEY_SAVE }, /* Screenshot */
- { 0x18, KEY_PLAYPAUSE },
- { 0x19, KEY_RECORD },
- { 0x1a, KEY_PLAY },
- { 0x1b, KEY_STOP },
- { 0x1c, KEY_FASTFORWARD },
- { 0x1d, KEY_REWIND },
- { 0x1e, KEY_VOLUMEDOWN },
- { 0x1f, KEY_VOLUMEUP },
- { 0x22, KEY_SLEEP }, /* Sleep */
- { 0x23, KEY_ZOOM }, /* Aspect */
- { 0x26, KEY_SCREEN }, /* Pos */
- { 0x27, KEY_ANGLE }, /* Size */
- { 0x28, KEY_SELECT }, /* Select */
- { 0x29, KEY_BLUE }, /* Blue/Picture */
- { 0x2a, KEY_BACKSPACE }, /* Back */
- { 0x2b, KEY_MEDIA }, /* PIP (Picture-in-picture) */
- { 0x2c, KEY_DOWN },
- { 0x2e, KEY_DOT },
- { 0x2f, KEY_TV }, /* Live TV */
- { 0x32, KEY_LEFT },
- { 0x33, KEY_CLEAR }, /* Clear */
- { 0x35, KEY_RED }, /* Red/TV */
- { 0x36, KEY_UP },
- { 0x37, KEY_HOME }, /* Home */
- { 0x39, KEY_GREEN }, /* Green/Video */
- { 0x3d, KEY_YELLOW }, /* Yellow/Music */
- { 0x3e, KEY_OK }, /* Ok */
- { 0x3f, KEY_RIGHT },
- { 0x40, KEY_NEXT }, /* Next */
- { 0x41, KEY_PREVIOUS }, /* Previous */
- { 0x42, KEY_CHANNELDOWN }, /* Channel down */
- { 0x43, KEY_CHANNELUP }, /* Channel up */
-};
-DEFINE_LEGACY_IR_KEYTABLE(avermedia_cardbus);
-#else
-DECLARE_IR_KEYTABLE(avermedia_cardbus);
-#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 @@
-/* avermedia-dvbt.h - Keytable for avermedia_dvbt Remote Controller
- *
- * Imported from ir-keymaps.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-/* Matt Jesson <dvb@jesson.eclipse.co.uk */
-
-#ifdef IR_KEYMAPS
-static struct ir_scancode avermedia_dvbt[] = {
- { 0x28, KEY_0 }, /* '0' / 'enter' */
- { 0x22, KEY_1 }, /* '1' */
- { 0x12, KEY_2 }, /* '2' / 'up arrow' */
- { 0x32, KEY_3 }, /* '3' */
- { 0x24, KEY_4 }, /* '4' / 'left arrow' */
- { 0x14, KEY_5 }, /* '5' */
- { 0x34, KEY_6 }, /* '6' / 'right arrow' */
- { 0x26, KEY_7 }, /* '7' */
- { 0x16, KEY_8 }, /* '8' / 'down arrow' */
- { 0x36, KEY_9 }, /* '9' */
-
- { 0x20, KEY_LIST }, /* 'source' */
- { 0x10, KEY_TEXT }, /* 'teletext' */
- { 0x00, KEY_POWER }, /* 'power' */
- { 0x04, KEY_AUDIO }, /* 'audio' */
- { 0x06, KEY_ZOOM }, /* 'full screen' */
- { 0x18, KEY_VIDEO }, /* 'display' */
- { 0x38, KEY_SEARCH }, /* 'loop' */