diff options
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.cx88 | 2 | ||||
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.tuner | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 9 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-simple.c | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
6 files changed, 20 insertions, 11 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.cx88 b/linux/Documentation/video4linux/CARDLIST.cx88 index a87f752e5..216f70549 100644 --- a/linux/Documentation/video4linux/CARDLIST.cx88 +++ b/linux/Documentation/video4linux/CARDLIST.cx88 @@ -26,4 +26,4 @@ card=24 - Hauppauge WinTV 28xxx (Roslyn) models card=25 - Digital-Logic MICROSPACE Entertainment Center (MEC) card=26 - IODATA GV/BCTV7E card=27 - PixelView PlayTV Ultra Pro (Stereo) -card=28 - DViCO - FusionHDTV 3 Gold-Q +card=28 - DViCO - FusionHDTV 3 Gold-T diff --git a/linux/Documentation/video4linux/CARDLIST.tuner b/linux/Documentation/video4linux/CARDLIST.tuner index 7f4fd0de4..aeb8df8ce 100644 --- a/linux/Documentation/video4linux/CARDLIST.tuner +++ b/linux/Documentation/video4linux/CARDLIST.tuner @@ -58,4 +58,4 @@ tuner=56 - Philips PAL/SECAM multi (FQ1216AME MK4) tuner=57 - Philips FQ1236A MK4 tuner=58 - Ymec TVision TVF-8531MF tuner=59 - Ymec TVision TVF-5533MF -tuner=60 - Thomson DDT 7611 +tuner=60 - Thomson DDT 7611 (ATSC/NTSC) diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 2b78402cb..5da887a1b 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-cards.c,v 1.72 2005/06/01 19:24:57 mchehab Exp $ + * $Id: cx88-cards.c,v 1.73 2005/06/03 11:39:35 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -617,9 +617,10 @@ struct cx88_board cx88_boards[] = { .gpio0 = 0xbf60, }, }, - [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q] = { - .name = "DViCO - FusionHDTV 3 Gold-Q", + [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = { + .name = "DViCO - FusionHDTV 3 Gold-T", .tuner_type = TUNER_THOMSON_DTT7611, + /* See DViCO FusionHDTV 3 Gold for GPIO documentation. */ .input = {{ .type = CX88_VMUX_TELEVISION, .vmux = 0, @@ -712,7 +713,7 @@ struct cx88_subid cx88_subids[] = { },{ .subvendor = 0x18ac, .subdevice = 0xd820, - .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, + .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T, },{ .subvendor = 0x18AC, .subdevice = 0xDB00, diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index bd9494834..d08d7b054 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.58 2005/05/29 10:22:08 nsh Exp $ + * $Id: cx88.h,v 1.59 2005/06/03 11:39:35 mchehab Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -164,7 +164,7 @@ extern struct sram_channel cx88_sram_channels[]; #define CX88_BOARD_DIGITALLOGIC_MEC 25 #define CX88_BOARD_IODATA_GVBCTV7E 26 #define CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO 27 -#define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q 28 +#define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T 28 enum cx88_itype { CX88_VMUX_COMPOSITE1 = 1, diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c index 4998fcc6f..453a0889f 100644 --- a/linux/drivers/media/video/tuner-simple.c +++ b/linux/drivers/media/video/tuner-simple.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-simple.c,v 1.14 2005/05/30 02:02:47 mchehab Exp $ + * $Id: tuner-simple.c,v 1.15 2005/06/03 11:39:35 mchehab Exp $ * * i2c tv tuner chip device driver * controls all those simple 4-control-bytes style tuners. @@ -218,7 +218,7 @@ static struct tunertype tuners[] = { 16*160.00,16*454.00,0xa0,0x90,0x30,0x8e,732}, { "Ymec TVision TVF-5533MF", TEMIC, NTSC, 16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732}, - { "Thomson DDT 7611", THOMSON, ATSC, + { "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC, 16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732}, }; unsigned const int tuner_count = ARRAY_SIZE(tuners); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index df319679e..4aad432f2 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-06-03 12:33 mchehab + * cx88-cards.c, cx88.h, CARDLIST.cx88, CARDLIST.tuner, tuner-simple.c: + + - DViCO FusionHDTV3 Gold-Q renamed to Gold-T + - adds (ATSC/NTSC) next to the Thomson DDT 7611 name. + Thanks to Michael Krufky <mkrufky@m1k.net>. + + 2005-06-01 20:21 mchehab * cx88-cards.c: @@ -1107,7 +1115,7 @@ saa7134-reg.h, saa7134-ts.c, saa7134-tvaudio.c, saa7134-vbi.c, saa7134-video.c, saa7134.h, video-buf.c, video-buf.h: - - added a bunch of $Id: ChangeLog,v 1.16 2005/06/01 19:24:57 mchehab Exp $ tags. + - added a bunch of $Id: ChangeLog,v 1.17 2005/06/03 11:39:35 mchehab Exp $ tags. 2004-09-15 17:35 kraxel |