Skip to content

Commit

Permalink
V4L/DVB: ir-common: remove keymap tables from the module
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mauro Carvalho Chehab committed May 19, 2010
1 parent 02858ee commit bd7261d
Show file tree
Hide file tree
Showing 68 changed files with 1 addition and 4,157 deletions.
2 changes: 1 addition & 1 deletion drivers/media/IR/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ir-common-objs := ir-functions.o ir-keymaps.o
ir-common-objs := ir-functions.o
ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o

obj-y += keymaps/
Expand Down
45 changes: 0 additions & 45 deletions drivers/media/IR/ir-keymaps.c

This file was deleted.

65 changes: 0 additions & 65 deletions include/media/ir-common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 0 additions & 18 deletions include/media/ir-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
65 changes: 0 additions & 65 deletions include/media/keycodes/adstech-dvb-t-pci.h

This file was deleted.

56 changes: 0 additions & 56 deletions include/media/keycodes/apac-viewcomp.h

This file was deleted.

67 changes: 0 additions & 67 deletions include/media/keycodes/asus-pc39.h

This file was deleted.

45 changes: 0 additions & 45 deletions include/media/keycodes/ati-tv-wonder-hd-600.h

This file was deleted.

Loading

0 comments on commit bd7261d

Please sign in to comment.