diff options
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.cx88 | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 18 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 11 |
5 files changed, 33 insertions, 3 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.cx88 b/linux/Documentation/video4linux/CARDLIST.cx88 index ca46fbf48..12e9e3938 100644 --- a/linux/Documentation/video4linux/CARDLIST.cx88 +++ b/linux/Documentation/video4linux/CARDLIST.cx88 @@ -33,3 +33,4 @@ 32 -> AverMedia UltraTV Media Center PCI 550 [1461:8011] 33 -> Kworld V-Stream Xpert DVD 34 -> ATI HDTV Wonder [1002:a101] + 35 -> WinFast DTV1000-T [107d:665f] diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index edc495294..2adcd5b29 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.98 2005/10/05 04:19:55 mkrufky Exp $ + * $Id: cx88-cards.c,v 1.99 2005/10/11 05:20:47 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -857,6 +857,18 @@ struct cx88_board cx88_boards[] = { .dvb = 1, #endif }, + [CX88_BOARD_WINFAST_DTV1000] = { + .name = "WinFast DTV1000-T", + .tuner_type = TUNER_ABSENT, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .input = {{ + .type = CX88_VMUX_DVB, + .vmux = 0, + }}, + .dvb = 1, + }, }; const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); @@ -996,6 +1008,10 @@ struct cx88_subid cx88_subids[] = { .subvendor = PCI_VENDOR_ID_ATI, .subdevice = 0xa101, .card = CX88_BOARD_ATI_HDTVWONDER, + },{ + .subvendor = 0x107d, + .subdevice = 0x665f, + .card = CX88_BOARD_WINFAST_DTV1000, }, }; const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 4e79d2cdd..226008beb 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.67 2005/09/21 00:56:30 mkrufky Exp $ + * $Id: cx88-dvb.c,v 1.68 2005/10/11 05:20:47 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -305,6 +305,7 @@ static int dvb_register(struct cx8802_dev *dev) break; case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: case CX88_BOARD_CONEXANT_DVB_T1: + case CX88_BOARD_WINFAST_DTV1000: dev->dvb.frontend = cx22702_attach(&connexant_refboard_config, &dev->core->i2c_adap); break; diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index ea16e8300..f8c98a8aa 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.84 2005/10/09 18:07:06 mchehab Exp $ + * $Id: cx88.h,v 1.85 2005/10/11 05:20:47 mkrufky Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -184,6 +184,7 @@ extern struct sram_channel cx88_sram_channels[]; #define CX88_BOARD_AVERMEDIA_ULTRATV_MC_550 32 #define CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD 33 #define CX88_BOARD_ATI_HDTVWONDER 34 +#define CX88_BOARD_WINFAST_DTV1000 35 enum cx88_itype { CX88_VMUX_COMPOSITE1 = 1, diff --git a/v4l/ChangeLog b/v4l/ChangeLog index b0659a101..ba4c643ce 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2005-10-11 05:17 mkrufky + + * ../linux/Documentation/video4linux/CARDLIST.cx88: + * ../linux/drivers/media/video/cx88/cx88-cards.c: + * ../linux/drivers/media/video/cx88/cx88-dvb.c: (dvb_register): + * ../linux/drivers/media/video/cx88/cx88.h: + - Add DVB card WinFast DTV1000-T + + From: David Shirley <David.Shirley@team.telstra.com> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-11 04:23 mchehab * ../v4l/Makefile: |