Commit bd7261d3 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 02858eed

drivers/media/IR/Makefile

+1 −1
Original line number Diff line number Diff line 
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/

drivers/media/IR/ir-keymaps.c

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
/*

    Keytables for supported remote controls, used on drivers/media

    devices.



    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.



    This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of

    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

    GNU General Public License for more details.



    You should have received a copy of the GNU General Public License

    along with this program; if not, write to the Free Software

    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/



#define IR_KEYMAPS



/*

 * NOTICE FOR DEVELOPERS:

 *   The IR mappings should be as close as possible to what's

 *   specified at:

 *      http://linuxtv.org/wiki/index.php/Remote_Controllers

 *

 * The usage of tables with just the command part is deprecated.

 * All new IR keytables should contain address+command and need

 * to define the proper IR_TYPE (IR_TYPE_RC5/IR_TYPE_NEC).

 * The deprecated tables should use IR_TYPE_UNKNOWN

 */

#include <linux/module.h>



#include <linux/input.h>

#include <media/ir-common.h>



/*

 * All keytables got moved to include/media/keytables directory.

 * This file is still needed - at least for now, as their data is

 * dynamically inserted here by the media/ir-common.h, due to the

 * #define IR_KEYMAPS line, at the beginning of this file. The

 * plans are to get rid of this file completely in a near future.

 */

include/media/ir-common.h

+0 −65
Original line number Diff line number Diff line
@@ -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)

include/media/ir-core.h

+0 −18
Original line number Diff line number Diff line
@@ -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);

include/media/keycodes/adstech-dvb-t-pci.h

deleted100644 → 0
+0 −65
Original line number Diff line number Diff line 
/* 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