patch-2.3.99-pre1 linux/drivers/char/bttv.c

• Lines: 56
• Date: Sun Mar 12 19:12:09 2000
• Orig file: v2.3.51/linux/drivers/char/bttv.c
• Orig date: Fri Mar 10 16:40:42 2000

diff -u --recursive --new-file v2.3.51/linux/drivers/char/bttv.c linux/drivers/char/bttv.c
@@ -719,12 +719,14 @@
 
 /* ----------------------------------------------------------------------- */
 
+/* for some vendors it is just the PCI ID */
 static struct VENDOR {
 	int id;
 	char *name;
 } vendors[] = {
 	{ 0x0001, "ATI Technologies Inc" },
 	{ 0x10b4, "STB Systems Inc" },
+	{ 0x1118, "Terratec" },
 	{ 0x13eb, "Hauppauge Computer Works Inc" },
 	{ 0x1461, "Avermedia" },
 	{ 0x1850, "Chronos" },
@@ -743,6 +745,7 @@
 } cards[] = {
 	{ 0x0001, 0x1002, BTTV_HAUPPAUGE878,  "TV Wonder" },
 	{ 0x10b4, 0x2636, BTTV_HAUPPAUGE878,  "???" },
+	{ 0x1118, 0x153b, BTTV_TERRATVALUE,   "TV Value" },
 	{ 0x13eb, 0x0070, BTTV_HAUPPAUGE878,  "WinTV" },
 	{ 0x1461, 0x0002, BTTV_AVERMEDIA98,   "TVCapture 98" },
 	{ 0x1850, 0x1851, BTTV_CHRONOS_VS2,   "Video Shuttle II" },
@@ -2018,6 +2021,7 @@
                 btv->gbuf[i].stat = GBUFFER_UNUSED;
 
         burst(0);
+	set_pll(btv);
         btv->user++;
 	up(&btv->lock);
         MOD_INC_USE_COUNT;
@@ -2235,6 +2239,7 @@
 		if (btv->win.norm != v.mode) {
 			btv->win.norm = v.mode;
                         down(&btv->lock);
+			set_pll(btv);
 			make_vbitab(btv);
 			bt848_set_winsize(btv);
 			up(&btv->lock);
@@ -2866,6 +2871,7 @@
 static int radio_open(struct video_device *dev, int flags)
 {
 	struct bttv *btv = (struct bttv *)(dev-1);
+	unsigned long v;
 
         down(&btv->lock);
 	if (btv->user)
@@ -2873,6 +2879,8 @@
 	btv->user++;
 
 	btv->radio = 1;
+	v = 400*16;
+	call_i2c_clients(btv,VIDIOCSFREQ,&v);
 	call_i2c_clients(btv,AUDC_SET_RADIO,&btv->tuner_type);
 	bt848_muxsel(btv,0);
 	up(&btv->lock);