openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] rc-videomate-m1f.c Rename to match remote controler name 

This remote was added with support for card Compro VideoMate M1F.

This remote is shipped with various Compro cards, not this one only.

Furthermore this remote can be bought separately under name Compro
VideoMate K100.
    http://compro.com.tw/en/product/k100/k100.html

So give it a proper name.

[mchehab@redhat.com: Fix the Makefile]
Signed-off-by: Samuel Rakitničan <samuel.rakitnican@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Samuel Rakitnican 2012-01-06 17:34:53 -03:00 committed by Mauro Carvalho Chehab
parent c18e1c7bd1
commit 0963119fca
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/rc/keymaps/rc-videomate-m1f.c
View File

@ -1,4 +1,4 @@
/* videomate-m1f.h - Keytable for videomate_m1f Remote Controller
/* videomate-k100.h - Keytable for videomate_k100 Remote Controller
*
* keymap imported from ir-keymaps.c
*
@ -13,7 +13,7 @@
#include <media/rc-map.h>
#include <linux/module.h>
static struct rc_map_table videomate_m1f[] = {
static struct rc_map_table videomate_k100[] = {
{ 0x01, KEY_POWER },
{ 0x31, KEY_TUNER },
{ 0x33, KEY_VIDEO },
@ -67,27 +67,27 @@ static struct rc_map_table videomate_m1f[] = {
{ 0x18, KEY_TEXT },
};
static struct rc_map_list videomate_m1f_map = {
static struct rc_map_list videomate_k100_map = {
.map = {
.scan = videomate_m1f,
.size = ARRAY_SIZE(videomate_m1f),
.scan = videomate_k100,
.size = ARRAY_SIZE(videomate_k100),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_VIDEOMATE_M1F,
.name = RC_MAP_VIDEOMATE_K100,
}
};
static int __init init_rc_map_videomate_m1f(void)
static int __init init_rc_map_videomate_k100(void)
{
return rc_map_register(&videomate_m1f_map);
return rc_map_register(&videomate_k100_map);
}
static void __exit exit_rc_map_videomate_m1f(void)
static void __exit exit_rc_map_videomate_k100(void)
{
rc_map_unregister(&videomate_m1f_map);
rc_map_unregister(&videomate_k100_map);
}
module_init(init_rc_map_videomate_m1f)
module_exit(exit_rc_map_videomate_m1f)
module_init(init_rc_map_videomate_k100)
module_exit(exit_rc_map_videomate_k100)
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Pavel Osnova <pvosnova@gmail.com>");

2
drivers/media/video/saa7134/saa7134-input.c
View File

@ -755,7 +755,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
polling = 50; /* ms */
break;
case SAA7134_BOARD_VIDEOMATE_M1F:
ir_codes = RC_MAP_VIDEOMATE_M1F;
ir_codes = RC_MAP_VIDEOMATE_K100;
mask_keycode = 0x0ff00;
mask_keyup = 0x040000;
break;

2
include/media/rc-map.h
View File

@ -147,7 +147,7 @@ void rc_map_init(void);
#define RC_MAP_TREKSTOR "rc-trekstor"
#define RC_MAP_TT_1500 "rc-tt-1500"
#define RC_MAP_TWINHAN_VP1027_DVBS "rc-twinhan1027"
#define RC_MAP_VIDEOMATE_M1F "rc-videomate-m1f"
#define RC_MAP_VIDEOMATE_K100 "rc-videomate-k100"
#define RC_MAP_VIDEOMATE_S350 "rc-videomate-s350"
#define RC_MAP_VIDEOMATE_TV_PVR "rc-videomate-tv-pvr"
#define RC_MAP_WINFAST "rc-winfast"