diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 33 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-simple.c | 4 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 1 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
5 files changed, 40 insertions, 10 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index d615416f8..c46758132 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.67 2005/05/15 19:01:26 mchehab Exp $ + * $Id: cx88-cards.c,v 1.68 2005/05/29 10:22:08 nsh Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -428,13 +428,28 @@ struct cx88_board cx88_boards[] = { .vmux = 2, .gpio0 = 0x0f00, }}, -#if 0 - .ts = { - .type = CX88_TS, - .gpio0 = 0x00000f01, /* Hooked to tuner reset bit */ - } -#endif }, + [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q] = { + .name = "DViCO - FusionHDTV 3 Gold-Q", + .tuner_type = TUNER_THOMSON_DTT7611, + .input = {{ + .type = CX88_VMUX_TELEVISION, + .vmux = 0, + .gpio0 = 0x0f0d, + },{ + .type = CX88_VMUX_CABLE, + .vmux = 0, + .gpio0 = 0x0f05, + },{ + .type = CX88_VMUX_COMPOSITE1, + .vmux = 1, + .gpio0 = 0x0f00, + },{ + .type = CX88_VMUX_SVIDEO, + .vmux = 2, + .gpio0 = 0x0f00, + }}, + }, [CX88_BOARD_HAUPPAUGE_DVB_T1] = { .name = "Hauppauge Nova-T DVB-T", .tuner_type = TUNER_ABSENT, @@ -695,6 +710,10 @@ struct cx88_subid cx88_subids[] = { .subdevice = 0xd810, .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD, },{ + .subvendor = 0x18ac, + .subdevice = 0xd820, + .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, + },{ .subvendor = 0x18AC, .subdevice = 0xDB00, .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1, diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index b40990776..bd9494834 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.57 2005/05/15 19:01:26 mchehab Exp $ + * $Id: cx88.h,v 1.58 2005/05/29 10:22:08 nsh Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -164,6 +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 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 7a828a9bc..d100901e0 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.12 2005/05/27 05:45:45 mchehab Exp $ + * $Id: tuner-simple.c,v 1.13 2005/05/29 10:22:08 nsh Exp $ * * i2c tv tuner chip device driver * controls all those simple 4-control-bytes style tuners. @@ -218,6 +218,8 @@ 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, + 16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732}, }; unsigned const int tuner_count = ARRAY_SIZE(tuners); diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 44b725fa9..9a7584e10 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -100,6 +100,7 @@ #define TUNER_YMEC_TVF_8531MF 58 #define TUNER_YMEC_TVF_5533MF 59 /* Pixelview Pro Ultra NTSC */ +#define TUNER_THOMSON_DTT7611 60 #define NOTUNER 0 #define PAL 1 /* PAL_BG */ diff --git a/v4l/ChangeLog b/v4l/ChangeLog index cf8cb7cb9..ead86d9e3 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-05-29 13:38 nshmyrev + + * cx88-cards.c, cx88.h: + + Add support for "DViCO - FusionHDTV 3 Gold-Q". Thanks to + Michael Krufky <mkrufky@m1k.net>. + 2005-05-25 04:00 nshmyrev * bttv-cards.c, bttv.h: @@ -1029,7 +1036,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.7 2005/05/24 23:41:42 nsh Exp $ tags. + - added a bunch of $Id: ChangeLog,v 1.8 2005/05/29 10:22:08 nsh Exp $ tags. 2004-09-15 17:35 kraxel |