Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Samuel Rakitnican and committed by
Mauro Carvalho Chehab
0963119f c18e1c7b

+14 -14
+12 -12
drivers/media/rc/keymaps/rc-videomate-m1f.c
··· 1 - /* videomate-m1f.h - Keytable for videomate_m1f Remote Controller 1 + /* videomate-k100.h - Keytable for videomate_k100 Remote Controller 2 2 * 3 3 * keymap imported from ir-keymaps.c 4 4 * ··· 13 13 #include <media/rc-map.h> 14 14 #include <linux/module.h> 15 15 16 - static struct rc_map_table videomate_m1f[] = { 16 + static struct rc_map_table videomate_k100[] = { 17 17 { 0x01, KEY_POWER }, 18 18 { 0x31, KEY_TUNER }, 19 19 { 0x33, KEY_VIDEO }, ··· 67 67 { 0x18, KEY_TEXT }, 68 68 }; 69 69 70 - static struct rc_map_list videomate_m1f_map = { 70 + static struct rc_map_list videomate_k100_map = { 71 71 .map = { 72 - .scan = videomate_m1f, 73 - .size = ARRAY_SIZE(videomate_m1f), 72 + .scan = videomate_k100, 73 + .size = ARRAY_SIZE(videomate_k100), 74 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 79 - static int __init init_rc_map_videomate_m1f(void) 79 + static 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 84 - static void __exit exit_rc_map_videomate_m1f(void) 84 + static 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 89 - module_init(init_rc_map_videomate_m1f) 90 - module_exit(exit_rc_map_videomate_m1f) 89 + module_init(init_rc_map_videomate_k100) 90 + module_exit(exit_rc_map_videomate_k100) 91 91 92 92 MODULE_LICENSE("GPL"); 93 93 MODULE_AUTHOR("Pavel Osnova <pvosnova@gmail.com>");
+1 -1
drivers/media/video/saa7134/saa7134-input.c
··· 755 755 polling = 50; /* ms */ 756 756 break; 757 757 case SAA7134_BOARD_VIDEOMATE_M1F: 758 - ir_codes = RC_MAP_VIDEOMATE_M1F; 758 + ir_codes = RC_MAP_VIDEOMATE_K100; 759 759 mask_keycode = 0x0ff00; 760 760 mask_keyup = 0x040000; 761 761 break;
+1 -1
include/media/rc-map.h
··· 147 147 #define RC_MAP_TREKSTOR "rc-trekstor" 148 148 #define RC_MAP_TT_1500 "rc-tt-1500" 149 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 151 #define RC_MAP_VIDEOMATE_S350 "rc-videomate-s350" 152 152 #define RC_MAP_VIDEOMATE_TV_PVR "rc-videomate-tv-pvr" 153 153 #define RC_MAP_WINFAST "rc-winfast"