V4L/DVB: ir-core: Make use of the new IR keymap modules
Instead of using the ugly keymap sequences, use the new rc-*.ko keymap files. For now, it is still needed to have one keymap loaded, for the RC code to work. Later patches will remove this depenency. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab
+19
-2
@@ -21,6 +21,7 @@
|
||||
#include <linux/kfifo.h>
|
||||
#include <linux/time.h>
|
||||
#include <linux/timer.h>
|
||||
#include <media/rc-map.h>
|
||||
|
||||
extern int ir_core_debug;
|
||||
#define IR_dprintk(level, fmt, arg...) if (ir_core_debug >= level) \
|
||||
@@ -124,6 +125,7 @@ EXPORT_SYMBOL_GPL(IR_KEYTABLE(tabname))
|
||||
int ir_register_map(struct rc_keymap *map);
|
||||
void ir_unregister_map(struct rc_keymap *map);
|
||||
struct ir_scancode_table *get_rc_map(const char *name);
|
||||
void rc_map_init(void);
|
||||
|
||||
/* Routines from ir-keytable.c */
|
||||
|
||||
@@ -141,15 +143,30 @@ static inline int ir_input_register(struct input_dev *dev,
|
||||
const struct ir_dev_props *props,
|
||||
const char *driver_name) {
|
||||
struct ir_scancode_table *ir_codes;
|
||||
struct ir_input_dev *ir_dev;
|
||||
int rc;
|
||||
|
||||
if (!map_name)
|
||||
return -EINVAL;
|
||||
|
||||
ir_codes = get_rc_map(map_name);
|
||||
if (!ir_codes)
|
||||
return -EINVAL;
|
||||
|
||||
return __ir_input_register(dev, ir_codes, props, driver_name);
|
||||
rc = __ir_input_register(dev, ir_codes, props, driver_name);
|
||||
if (rc < 0)
|
||||
return -EINVAL;
|
||||
|
||||
ir_dev = input_get_drvdata(dev);
|
||||
|
||||
if (!rc && ir_dev->props && ir_dev->props->change_protocol)
|
||||
rc = ir_dev->props->change_protocol(ir_dev->props->priv,
|
||||
ir_codes->ir_type);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
void ir_input_unregister(struct input_dev *input_dev);
|
||||
void ir_input_unregister(struct input_dev *input_dev);
|
||||
|
||||
/* Routines from ir-sysfs.c */
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
struct IR_i2c;
|
||||
|
||||
struct IR_i2c {
|
||||
struct ir_scancode_table *ir_codes;
|
||||
char *ir_codes;
|
||||
|
||||
struct i2c_client *c;
|
||||
struct input_dev *input;
|
||||
@@ -34,7 +34,7 @@ enum ir_kbd_get_key_fn {
|
||||
|
||||
/* Can be passed when instantiating an ir_video i2c device */
|
||||
struct IR_i2c_init_data {
|
||||
struct ir_scancode_table *ir_codes;
|
||||
char *ir_codes;
|
||||
const char *name;
|
||||
u64 type; /* IR_TYPE_RC5, IR_TYPE_PD, etc */
|
||||
/*
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
/*
|
||||
* rc-map.h - define RC map names used by RC drivers
|
||||
*
|
||||
* Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <media/ir-core.h>
|
||||
|
||||
#define RC_MAP_ADSTECH_DVB_T_PCI "rc-adstech-dvb-t-pci"
|
||||
#define RC_MAP_APAC_VIEWCOMP "rc-apac-viewcomp"
|
||||
#define RC_MAP_ASUS_PC39 "rc-asus-pc39"
|
||||
#define RC_MAP_ATI_TV_WONDER_HD_600 "rc-ati-tv-wonder-hd-600"
|
||||
#define RC_MAP_AVERMEDIA_A16D "rc-avermedia-a16d"
|
||||
#define RC_MAP_AVERMEDIA_CARDBUS "rc-avermedia-cardbus"
|
||||
#define RC_MAP_AVERMEDIA_DVBT "rc-avermedia-dvbt"
|
||||
#define RC_MAP_AVERMEDIA_M135A_RM_JX "rc-avermedia-m135a-rm-jx"
|
||||
#define RC_MAP_AVERMEDIA "rc-avermedia"
|
||||
#define RC_MAP_AVERTV_303 "rc-avertv-303"
|
||||
#define RC_MAP_BEHOLD_COLUMBUS "rc-behold-columbus"
|
||||
#define RC_MAP_BEHOLD "rc-behold"
|
||||
#define RC_MAP_BUDGET_CI_OLD "rc-budget-ci-old"
|
||||
#define RC_MAP_CINERGY_1400 "rc-cinergy-1400"
|
||||
#define RC_MAP_CINERGY "rc-cinergy"
|
||||
#define RC_MAP_DM1105_NEC "rc-dm1105-nec"
|
||||
#define RC_MAP_DNTV_LIVE_DVBT_PRO "rc-dntv-live-dvbt-pro"
|
||||
#define RC_MAP_DNTV_LIVE_DVB_T "rc-dntv-live-dvb-t"
|
||||
#define RC_MAP_EMPTY "rc-empty"
|
||||
#define RC_MAP_EM_TERRATEC "rc-em-terratec"
|
||||
#define RC_MAP_ENCORE_ENLTV2 "rc-encore-enltv2"
|
||||
#define RC_MAP_ENCORE_ENLTV_FM53 "rc-encore-enltv-fm53"
|
||||
#define RC_MAP_ENCORE_ENLTV "rc-encore-enltv"
|
||||
#define RC_MAP_EVGA_INDTUBE "rc-evga-indtube"
|
||||
#define RC_MAP_EZTV "rc-eztv"
|
||||
#define RC_MAP_FLYDVB "rc-flydvb"
|
||||
#define RC_MAP_FLYVIDEO "rc-flyvideo"
|
||||
#define RC_MAP_FUSIONHDTV_MCE "rc-fusionhdtv-mce"
|
||||
#define RC_MAP_GADMEI_RM008Z "rc-gadmei-rm008z"
|
||||
#define RC_MAP_GENIUS_TVGO_A11MCE "rc-genius-tvgo-a11mce"
|
||||
#define RC_MAP_GOTVIEW7135 "rc-gotview7135"
|
||||
#define RC_MAP_HAUPPAUGE_NEW "rc-hauppauge-new"
|
||||
#define RC_MAP_IODATA_BCTV7E "rc-iodata-bctv7e"
|
||||
#define RC_MAP_KAIOMY "rc-kaiomy"
|
||||
#define RC_MAP_KWORLD_315U "rc-kworld-315u"
|
||||
#define RC_MAP_KWORLD_PLUS_TV_ANALOG "rc-kworld-plus-tv-analog"
|
||||
#define RC_MAP_MANLI "rc-manli"
|
||||
#define RC_MAP_MSI_TVANYWHERE_PLUS "rc-msi-tvanywhere-plus"
|
||||
#define RC_MAP_MSI_TVANYWHERE "rc-msi-tvanywhere"
|
||||
#define RC_MAP_NEBULA "rc-nebula"
|
||||
#define RC_MAP_NEC_TERRATEC_CINERGY_XS "rc-nec-terratec-cinergy-xs"
|
||||
#define RC_MAP_NORWOOD "rc-norwood"
|
||||
#define RC_MAP_NPGTECH "rc-npgtech"
|
||||
#define RC_MAP_PCTV_SEDNA "rc-pctv-sedna"
|
||||
#define RC_MAP_PINNACLE_COLOR "rc-pinnacle-color"
|
||||
#define RC_MAP_PINNACLE_GREY "rc-pinnacle-grey"
|
||||
#define RC_MAP_PINNACLE_PCTV_HD "rc-pinnacle-pctv-hd"
|
||||
#define RC_MAP_PIXELVIEW_NEW "rc-pixelview-new"
|
||||
#define RC_MAP_PIXELVIEW "rc-pixelview"
|
||||
#define RC_MAP_POWERCOLOR_REAL_ANGEL "rc-powercolor-real-angel"
|
||||
#define RC_MAP_PROTEUS_2309 "rc-proteus-2309"
|
||||
#define RC_MAP_PURPLETV "rc-purpletv"
|
||||
#define RC_MAP_PV951 "rc-pv951"
|
||||
#define RC_MAP_RC5_HAUPPAUGE_NEW "rc-rc5-hauppauge-new"
|
||||
#define RC_MAP_RC5_TV "rc-rc5-tv"
|
||||
#define RC_MAP_REAL_AUDIO_220_32_KEYS "rc-real-audio-220-32-keys"
|
||||
#define RC_MAP_TBS_NEC "rc-tbs-nec"
|
||||
#define RC_MAP_TERRATEC_CINERGY_XS "rc-terratec-cinergy-xs"
|
||||
#define RC_MAP_TEVII_NEC "rc-tevii-nec"
|
||||
#define RC_MAP_TT_1500 "rc-tt-1500"
|
||||
#define RC_MAP_VIDEOMATE_S350 "rc-videomate-s350"
|
||||
#define RC_MAP_VIDEOMATE_TV_PVR "rc-videomate-tv-pvr"
|
||||
#define RC_MAP_WINFAST "rc-winfast"
|
||||
#define RC_MAP_WINFAST_USBII_DELUXE "rc-winfast-usbii-deluxe"
|
||||
/*
|
||||
* Please, do not just append newer Remote Controller names at the end.
|
||||
* The names should be ordered in alphabetical order
|
||||
*/
|
||||
Reference in New Issue
Block a user