---

yaml --- r: 13347 b: refs/heads/master c: 2b5200a h: refs/heads/master i: 13345: 75f6eae 13343: d5c8dee v: v3
git-mirror · Nov 9, 2005 · 2c28782 · 2c28782
1 parent a162772
commit 2c28782
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40c717ff48b2c91091a69de0e28c02a43e9b0c7c
+refs/heads/master: 2b5200a7b19a53969db68c97d379339592ca6a4f
diff --git a/trunk/Documentation/video4linux/CARDLIST.cx88 b/trunk/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/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c
@@ -852,6 +852,18 @@ struct cx88_board cx88_boards[] = {
 			.gpio3  = 0x00000000,
 		}},
 	},
+	[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);
 
@@ -991,6 +1003,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/trunk/drivers/media/video/cx88/cx88-dvb.c b/trunk/drivers/media/video/cx88/cx88-dvb.c
@@ -299,6 +299,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/trunk/drivers/media/video/cx88/cx88.h b/trunk/drivers/media/video/cx88/cx88.h
@@ -177,6 +177,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,