Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 09:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] V4L: 914: use less generic name for saa7134 card 79

Browse Source 
Use less-generic name for saa7134 card #79

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ricardo Cerqueira 2005-11-08 21:38:47 -08:00 committed by Linus Torvalds
parent cb2444dfa2
commit 17ce1ff9cf
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/video/saa7134/saa7134-cards.c
View File

@ -2452,11 +2452,11 @@ struct saa7134_board saa7134_boards[] = {
.gpio = 0x0200000, .gpio = 0x0200000,
}, },
}, },
[SAA7134_BOARD_PCTV_CARDBUS] = { [SAA7134_BOARD_SEDNA_PC_TV_CARDBUS] = {
/* Paul Tom Zalac <pzalac@gmail.com> */ /* Paul Tom Zalac <pzalac@gmail.com> */
/* Pavel Mihaylov <bin@bash.info> */ /* Pavel Mihaylov <bin@bash.info> */
.name = "PCTV Cardbus TV/Radio (ITO25 Rev:2B)", .name = "Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)",
/* Sedna Cardbus TV Tuner */ /* Sedna/MuchTV (OEM) Cardbus TV Tuner */
.audio_clock = 0x00187de7, .audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_TDA8290, .tuner_type = TUNER_PHILIPS_TDA8290,
.radio_type = UNSET, .radio_type = UNSET,
@ -3067,7 +3067,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
case SAA7134_BOARD_AVACSSMARTTV: case SAA7134_BOARD_AVACSSMARTTV:
case SAA7134_BOARD_GOTVIEW_7135: case SAA7134_BOARD_GOTVIEW_7135:
case SAA7134_BOARD_KWORLD_TERMINATOR: case SAA7134_BOARD_KWORLD_TERMINATOR:
case SAA7134_BOARD_PCTV_CARDBUS: case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
dev->has_remote = SAA7134_REMOTE_GPIO; dev->has_remote = SAA7134_REMOTE_GPIO;
break; break;
case SAA7134_BOARD_MD5044: case SAA7134_BOARD_MD5044:

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

@ -546,7 +546,7 @@ static IR_KEYTAB_TYPE ir_codes_pinnacle[IR_KEYTAB_SIZE] = {
/* Mapping for the 28 key remote control as seen at /* Mapping for the 28 key remote control as seen at
http://www.sednacomputer.com/photo/cardbus-tv.jpg http://www.sednacomputer.com/photo/cardbus-tv.jpg
Pavel Mihaylov <bin@bash.info> */ Pavel Mihaylov <bin@bash.info> */
static IR_KEYTAB_TYPE pctv_cardbus_codes[IR_KEYTAB_SIZE] = { static IR_KEYTAB_TYPE pctv_sedna_codes[IR_KEYTAB_SIZE] = {
[ 0 ] = KEY_KP0, [ 0 ] = KEY_KP0,
[ 1 ] = KEY_KP1, [ 1 ] = KEY_KP1,
[ 2 ] = KEY_KP2, [ 2 ] = KEY_KP2,
@ -781,8 +781,8 @@ int saa7134_input_init1(struct saa7134_dev *dev)
mask_keyup = 0x004000; mask_keyup = 0x004000;
polling = 50; // ms polling = 50; // ms
break; break;
case SAA7134_BOARD_PCTV_CARDBUS: case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
ir_codes = pctv_cardbus_codes; ir_codes = pctv_sedna_codes;
mask_keycode = 0x001f00; mask_keycode = 0x001f00;
mask_keyup = 0x004000; mask_keyup = 0x004000;
polling = 50; // ms polling = 50; // ms

2
drivers/media/video/saa7134/saa7134.h
View File

@ -205,7 +205,7 @@ struct saa7134_format {
#define SAA7134_BOARD_MONSTERTV_MOBILE 76 #define SAA7134_BOARD_MONSTERTV_MOBILE 76
#define SAA7134_BOARD_PINNACLE_PCTV_110i 77 #define SAA7134_BOARD_PINNACLE_PCTV_110i 77
#define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78 #define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78
#define SAA7134_BOARD_PCTV_CARDBUS 79 #define SAA7134_BOARD_SEDNA_PC_TV_CARDBUS 79
#define SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV 80 #define SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV 80
#define SAA7134_BOARD_PHILIPS_TIGER 81 #define SAA7134_BOARD_PHILIPS_TIGER 81