aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rakitnican <samuel.rakitnican@gmail.com>2012-01-06 15:34:53 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-10 20:38:19 -0500
commit0963119fca6ad250146fd7d27eb90f205e188beb (patch)
tree66cb06fd0712b9fb70fb92c8f88439a9c29dac75
parentc18e1c7bd1f825ac55e00b23bb37fe36e2e4c784 (diff)
[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>
-rw-r--r--drivers/media/rc/keymaps/rc-videomate-m1f.c24
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c2
-rw-r--r--include/media/rc-map.h2
3 files changed, 14 insertions, 14 deletions
diff --git a/drivers/media/rc/keymaps/rc-videomate-m1f.c b/drivers/media/rc/keymaps/rc-videomate-m1f.c
index 3bd1de1f585c..23ee05e53949 100644
--- a/drivers/media/rc/keymaps/rc-videomate-m1f.c
+++ b/drivers/media/rc/keymaps/rc-videomate-m1f.c
@@ -1,4 +1,4 @@
1/* videomate-m1f.h - Keytable for videomate_m1f Remote Controller 1/* videomate-k100.h - Keytable for videomate_k100 Remote Controller
2 * 2 *
3 * keymap imported from ir-keymaps.c 3 * keymap imported from ir-keymaps.c
4 * 4 *
@@ -13,7 +13,7 @@
13#include <media/rc-map.h> 13#include <media/rc-map.h>
14#include <linux/module.h> 14#include <linux/module.h>
15 15
16static struct rc_map_table videomate_m1f[] = { 16static struct rc_map_table videomate_k100[] = {
17 { 0x01, KEY_POWER }, 17 { 0x01, KEY_POWER },
18 { 0x31, KEY_TUNER }, 18 { 0x31, KEY_TUNER },
19 { 0x33, KEY_VIDEO }, 19 { 0x33, KEY_VIDEO },
@@ -67,27 +67,27 @@ static struct rc_map_table videomate_m1f[] = {
67 { 0x18, KEY_TEXT }, 67 { 0x18, KEY_TEXT },
68}; 68};
69 69
70static struct rc_map_list videomate_m1f_map = { 70static struct rc_map_list videomate_k100_map = {
71 .map = { 71 .map = {
72 .scan = videomate_m1f, 72 .scan = videomate_k100,
73 .size = ARRAY_SIZE(videomate_m1f), 73 .size = ARRAY_SIZE(videomate_k100),
74 .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ 74 .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
75 .name = RC_MAP_VIDEOMATE_M1F, 75 .name = RC_MAP_VIDEOMATE_K100,
76 } 76 }
77}; 77};
78 78
79static int __init init_rc_map_videomate_m1f(void) 79static int __init init_rc_map_videomate_k100(void)
80{ 80{
81 return rc_map_register(&videomate_m1f_map); 81 return rc_map_register(&videomate_k100_map);
82} 82}
83 83
84static void __exit exit_rc_map_videomate_m1f(void) 84static void __exit exit_rc_map_videomate_k100(void)
85{ 85{
86 rc_map_unregister(&videomate_m1f_map); 86 rc_map_unregister(&videomate_k100_map);
87} 87}
88 88
89module_init(init_rc_map_videomate_m1f) 89module_init(init_rc_map_videomate_k100)
90module_exit(exit_rc_map_videomate_m1f) 90module_exit(exit_rc_map_videomate_k100)
91 91
92MODULE_LICENSE("GPL"); 92MODULE_LICENSE("GPL");
93MODULE_AUTHOR("Pavel Osnova <pvosnova@gmail.com>"); 93MODULE_AUTHOR("Pavel Osnova <pvosnova@gmail.com>");
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 1b15b0db7883..22ecd7297d2d 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -755,7 +755,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
755 polling = 50; /* ms */ 755 polling = 50; /* ms */
756 break; 756 break;
757 case SAA7134_BOARD_VIDEOMATE_M1F: 757 case SAA7134_BOARD_VIDEOMATE_M1F:
758 ir_codes = RC_MAP_VIDEOMATE_M1F; 758 ir_codes = RC_MAP_VIDEOMATE_K100;
759 mask_keycode = 0x0ff00; 759 mask_keycode = 0x0ff00;
760 mask_keyup = 0x040000; 760 mask_keyup = 0x040000;
761 break; 761 break;
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 183d701eb3ce..f688bde61228 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -147,7 +147,7 @@ void rc_map_init(void);
147#define RC_MAP_TREKSTOR "rc-trekstor" 147#define RC_MAP_TREKSTOR "rc-trekstor"
148#define RC_MAP_TT_1500 "rc-tt-1500" 148#define RC_MAP_TT_1500 "rc-tt-1500"
149#define RC_MAP_TWINHAN_VP1027_DVBS "rc-twinhan1027" 149#define RC_MAP_TWINHAN_VP1027_DVBS "rc-twinhan1027"
150#define RC_MAP_VIDEOMATE_M1F "rc-videomate-m1f" 150#define RC_MAP_VIDEOMATE_K100 "rc-videomate-k100"
151#define RC_MAP_VIDEOMATE_S350 "rc-videomate-s350" 151#define RC_MAP_VIDEOMATE_S350 "rc-videomate-s350"
152#define RC_MAP_VIDEOMATE_TV_PVR "rc-videomate-tv-pvr" 152#define RC_MAP_VIDEOMATE_TV_PVR "rc-videomate-tv-pvr"
153#define RC_MAP_WINFAST "rc-winfast" 153#define RC_MAP_WINFAST "rc-winfast"