patch-2.4.0-test11 linux/drivers/media/video/bttv-cards.c

Next file: linux/drivers/media/video/bttv-driver.c
Previous file: linux/drivers/media/video/audiochip.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/media/video/bttv-cards.c linux/drivers/media/video/bttv-cards.c
@@ -1,7 +1,6 @@
 /*
     bttv-cards.c  --  this file has card-specific stuff
 
-
     bttv - Bt848 frame grabber driver
 
     Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)
@@ -31,21 +30,32 @@
 #include <linux/module.h>
 #include <linux/kmod.h>
 #include <linux/init.h>
+#include <linux/pci.h>
 
 #include <asm/io.h>
 
-#include "bttv.h"
+#include "bttvp.h"
 #include "tuner.h"
 
 /* fwd decl */
 static void hauppauge_eeprom(struct bttv *btv);
-static void hauppauge_boot_msp34xx(struct bttv *btv);
 static void init_PXC200(struct bttv *btv);
+#if 0
 static void init_tea5757(struct bttv *btv);
+#endif
+
+static void winview_audio(struct bttv *btv, struct video_audio *v, int set);
+static void avermedia_tvphone_audio(struct bttv *btv, struct video_audio *v,
+				    int set);
+static void terratv_audio(struct bttv *btv, struct video_audio *v, int set);
+static void gvbctv3pci_audio(struct bttv *btv, struct video_audio *v, int set);
 
 MODULE_PARM(card,"1-4i");
+MODULE_PARM_DESC(card,"specify TV/grabber card model, see CARDLIST file for a list");
 MODULE_PARM(pll,"1-4i");
+MODULE_PARM_DESC(pll,"specify installed crystal (0=none, 28=28 MHz, 35=35 MHz)");
 MODULE_PARM(autoload,"i");
+MODULE_PARM_DESC(autoload,"automatically load i2c modules like tuner.o, default is 1 (yes)");
 
 static unsigned int card[4] = { -1, -1, -1, -1 };
 static unsigned int pll[4]  = { -1, -1, -1, -1 };
@@ -55,6 +65,14 @@
 static unsigned int autoload = 0;
 #endif
 
+MODULE_PARM(gpiomask,"i");
+MODULE_PARM(audioall,"i");
+MODULE_PARM(audiomux,"1-5i");
+static unsigned int gpiomask = -1;
+static unsigned int audioall = -1;
+static unsigned int audiomux[5] = { -1, -1, -1, -1, -1 };
+
+
 /* ----------------------------------------------------------------------- */
 /* list of card IDs for bt878+ cards                                       */
 
@@ -66,8 +84,9 @@
 	{ 0x00011002, BTTV_HAUPPAUGE878,  "ATI TV Wonder" },
 	{ 0x00011461, BTTV_AVPHONE98,     "AVerMedia TVPhone98" },
 	{ 0x00021461, BTTV_AVERMEDIA98,   "Avermedia TVCapture 98" },
+	{ 0x00031002, BTTV_HAUPPAUGE878,  "ATI TV Wonder/VE" },
 	{ 0x00031461, BTTV_AVPHONE98,     "AVerMedia TVPhone98" },
-	{ 0x00041461, BTTV_AVPHONE98,     "AVerMedia TVPhone98" },
+	{ 0x00041461, BTTV_AVERMEDIA98,   "AVerMedia TVCapture 98" },
 	{ 0x10b42636, BTTV_HAUPPAUGE878,  "STB ???" },
 	{ 0x1118153b, BTTV_TERRATVALUE,   "Terratec TV Value" },
 	{ 0x1123153b, BTTV_TERRATVRADIO,  "Terratec TV/Radio+" },
@@ -77,12 +96,17 @@
 	{ 0x18521852, BTTV_TYPHOON_TVIEW, "Typhoon TView TV/FM Tuner" },
 	{ 0x217d6606, BTTV_WINFAST2000,   "Leadtek WinFast TV 2000" },
 	{ 0x263610b4, BTTV_STB2,          "STB TV PCI FM, P/N 6000704" },
+	{ 0x3000121a, 0/* no entry yet */,"VoodooTV 200" },
 	{ 0x3000144f, BTTV_MAGICTVIEW063, "TView 99 (CPH063)" },
 	{ 0x300014ff, BTTV_MAGICTVIEW061, "TView 99 (CPH061)" },
 	{ 0x3002144f, BTTV_MAGICTVIEW061, "Askey Magic TView" },
 	{ 0x300214ff, BTTV_PHOEBE_TVMAS,  "Phoebe TV Master" },
+	{ 0x39000070, BTTV_HAUPPAUGE878,  "Hauppauge WinTV-D" },
 	{ 0x400a15b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV" },
-	{ 0x402010fc, 0 /* no tvcards entry yet */, "I-O Data Co. GV-BCV3/PCI" },
+	{ 0x401015b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV / Radio" },
+ 	{ 0x402010fc, BTTV_GVBCTV3PCI,    "I-O Data Co. GV-BCV3/PCI" },
+	{ 0xff000070, BTTV_HAUPPAUGE878,  "Osprey-100" },
+	{ 0xff010070, BTTV_HAUPPAUGE878,  "Osprey-200" },
 #if 0 /* probably wrong */
 	{ 0x14610002, BTTV_AVERMEDIA98,   "Avermedia TVCapture 98" },
 	{ 0x6606217d, BTTV_WINFAST2000,   "Leadtek WinFast TV 2000" },
@@ -93,286 +117,694 @@
 /* ----------------------------------------------------------------------- */
 /* array with description for bt848 / bt878 tv/grabber cards               */
 
-struct tvcard bttv_tvcards[] = 
+struct tvcard bttv_tvcards[] = {
 {
-	/* 0x00 */
-        { " *** UNKNOWN *** ",
-          3, 1, 0, 2, 0, { 2, 3, 1, 1}, { 0, 0, 0, 0, 0},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "MIRO PCTV",
-          4, 1, 0, 2,15, { 2, 3, 1, 1}, { 2, 0, 0, 0,10},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "Hauppauge old",
-          4, 1, 0, 2, 7, { 2, 3, 1, 1}, { 0, 1, 2, 3, 4},0,
-	  1,1,0,1,0,0,0,1,  PLL_NONE, -1 },
-        { "STB",
-          3, 1, 0, 2, 7, { 2, 3, 1, 1}, { 4, 0, 2, 3, 1},0,
-	  0,1,1,1,1,0,0,1,  PLL_NONE, -1 },
-
-        { "Intel",
-          3, 1, 0, -1, 7, { 2, 3, 1, 1}, { 0, 1, 2, 3, 4},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-	{ "Diamond DTV2000",
-          3, 1, 0, 2, 3, { 2, 3, 1, 1}, { 0, 1, 0, 1, 3},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-	{ "AVerMedia TVPhone",
-          3, 1, 0, 3,15, { 2, 3, 1, 1}, {12, 4,11,11, 0},0,
-	  1,1,1,1,0,0,0,1,  PLL_28, -1 },
-        { "MATRIX-Vision MV-Delta",
-          5, 1, -1, 3, 0, { 2, 3, 1, 0, 0},{0 }, 0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-
-	/* 0x08 */
-        { "Fly Video II",
-          3, 1, 0, 2, 0xc00, { 2, 3, 1, 1},
-	  { 0, 0xc00, 0x800, 0x400, 0xc00, 0},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "TurboTV",
-          3, 1, 0, 2, 3, { 2, 3, 1, 1}, { 1, 1, 2, 3, 0},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "Hauppauge new (bt878)",
-	  4, 1, 0, 2, 7, { 2, 0, 1, 1}, { 0, 1, 2, 3, 4},0,
-	  1,1,0,1,0,0,0,1,  PLL_28,   -1 },
-        { "MIRO PCTV pro",
-	  3, 1, 0, 2, 65551, { 2, 3, 1, 1}, {1,65537, 0, 0,10},0,
-       /* 3, 1, 0, 2, 0x3004F, { 2, 3, 1, 1}, {1, 0x10011, 5, 0,10}, 0x3004F, */
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-
-	{ "ADS Technologies Channel Surfer TV",
-	  3, 1, 2, 2, 15, { 2, 3, 1, 1}, { 13, 14, 11, 7, 0, 0},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "AVerMedia TVCapture 98",
-	  3, 4, 0, 2, 15, { 2, 3, 1, 1}, { 13, 14, 11, 7, 0, 0},0,
-	  1,1,1,1,0,0,0,1,  PLL_28,   -1 },
-        { "Aimslab VHX",
-          3, 1, 0, 2, 7, { 2, 3, 1, 1}, { 0, 1, 2, 3, 4},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "Zoltrix TV-Max",
-          3, 1, 0, 2,15, { 2, 3, 1, 1}, {0 , 0, 1 , 0, 10},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-
-	/* 0x10 */
-        { "Pixelview PlayTV (bt878)",
-          3, 1, 0, 2, 0x01fe00, { 2, 3, 1, 1},
-	  { 0x01c000, 0, 0x018000, 0x014000, 0x002000, 0 },0,
-	  1,1,1,1,0,0,0,1,  PLL_28,   -1 },
-        { "Leadtek WinView 601",
-          3, 1, 0, 2, 0x8300f8, { 2, 3, 1, 1,0},
-	  { 0x4fa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "AVEC Intercapture",
-	  3, 2, 0, 2, 0, {2, 3, 1, 1}, {1, 0, 0, 0, 0},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-	{ "LifeView FlyKit w/o Tuner",
-	  3, 1, -1, -1, 0x8dff00, { 2, 3, 1, 1}, { 0 },0,
-	  0,0,0,0,0,0,0,1,  PLL_NONE, -1 },
-
-        { "CEI Raffles Card",
-	  3, 3, 0, 2, 0, {2, 3, 1, 1}, {0, 0, 0, 0 ,0},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-	{ "Lucky Star Image World ConferenceTV",
-	  3, 1, 0, 2, 0x00fffe07, { 2, 3, 1, 1}, { 131072, 1, 1638400, 3, 4},0,
-	  1,1,1,1,0,0,0,1,  PLL_28,   TUNER_PHILIPS_PAL_I },
-	{ "Phoebe Tv Master + FM",
-	  3, 1, 0, 2, 0xc00, { 2, 3, 1, 1},{0, 1, 0x800, 0x400, 0xc00, 0},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "Modular Technology MM205 PCTV, bt878",
-	  2, 1, 0, -1, 7, { 2, 3 }, { 0, 0, 0, 0, 0 },0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-
-	/* 0x18 */
-        { "Askey/Typhoon/Anubis Magic TView CPH051/061 (bt878)",
-	  3, 1, 0, 2, 0xe00, { 2, 3, 1, 1}, {0x400, 0x400, 0x400, 0x400, 0},0,
-	  1,1,1,1,0,0,0,1,  PLL_28,   -1 },
-        { "Terratec/Vobis TV-Boostar",
-          3, 1, 0, 2, 16777215 , { 2, 3, 1, 1}, { 131072, 1, 1638400, 3,4},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "Newer Hauppauge WinCam (bt878)",
- 	  4, 1, 0, 3, 7, { 2, 0, 1, 1}, { 0, 1, 2, 3, 4},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "MAXI TV Video PCI2",
-          3, 1, 0, 2, 0xffff, { 2, 3, 1, 1}, { 0, 1, 2, 3, 0xc00},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, TUNER_PHILIPS_SECAM },
-
-        { "Terratec TerraTV+",
-          3, 1, 0, 2, 0x70000, { 2, 3, 1, 1}, 
-          { 0x20000, 0x30000, 0x00000, 0x10000, 0x40000},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "Imagenation PXC200",
-          5, 1, -1, 4, 0, { 2, 3, 1, 0, 0}, { 0 }, 0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "FlyVideo 98",
-          3, 1, 0, 2, 0x8dff00, {2, 3, 1, 1}, 
-          { 0, 0x8dff00, 0x8df700, 0x8de700, 0x8dff00, 0 },0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-        { "iProTV",
-	  3, 1, 0, 2, 1, { 2, 3, 1, 1}, { 1, 0, 0, 0, 0 },0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-
-	/* 0x20 */
-	{ "Intel Create and Share PCI",
-	  4, 1, 0, 2, 7, { 2, 3, 1, 1}, { 4, 4, 4, 4, 4},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-	{ "Terratec TerraTValue",
-	  3, 1, 0, 2, 0xffff00, { 2, 3, 1, 1},
-	  { 0x500, 0, 0x300, 0x900, 0x900},0,
-	  1,1,1,1,0,0,0,1,  PLL_NONE, -1 },
-	{ "Leadtek WinFast 2000",
-	  3, 1, 0, 2, 0xfff000, { 2, 3, 1, 1,0},
-	  { 0x621000,0x6ddf07,0x621100,0x620000,0xE210000,0x620000},0,
-	  1,1,1,1,1,0,0,1,  PLL_28,   -1 },
-	{ "Chronos Video Shuttle II",
-	  3, 3, 0, 2, 0x1800, { 2, 3, 1, 1}, { 0, 0, 0x1000, 0x1000, 0x0800},0,
-	  1,1,1,1,0,0,0,1,  PLL_28,   -1 },
-
-	{ "Typhoon TView TV/FM Tuner",
-	  3, 3, 0, 2, 0x1800, { 2, 3, 1, 1}, { 0, 0x800, 0, 0, 0x1800, 0 },0,
-	  1,1,1,1,0,0,0,1,  PLL_28,   -1 },
-	{ "PixelView PlayTV pro",
-          3, 1, 0, 2, 0xff, { 2, 3, 1, 1 },
-          { 0x21, 0x20, 0x24, 0x2c, 0x29, 0x29 }, 0,
-	  0,0,0,0,0,0,0,1,  PLL_28,   -1 },
-	{ "TView99 CPH063",
-	  3, 1, 0, 2, 0x551e00, { 2, 3, 1, 1},
-	  { 0x551400, 0x551200, 0, 0, 0, 0x551200 }, 0,
-	  1,1,1,1,0,0,0,1,  PLL_28, -1 },
-	{ "Pinnacle PCTV Rave",
-	  3, 1, 0, 2, 0x03000F, { 2, 3, 1, 1}, { 2, 0, 0, 0, 1},0,
-	  1,1,1,1,0,0,0,1,  PLL_28, -1 },
-
-        /* 0x28 */
-        { "STB2",
-          3, 1, 0, 2, 7, { 2, 3, 1, 1}, { 4, 0, 2, 3, 1},0,
-	  0,1,1,1,0,1,1,1,  PLL_NONE, -1 },
-        { "AVerMedia TVPhone 98",
-	  3, 4, 0, 2, 4, { 2, 3, 1, 1}, { 13, 14, 11, 7, 0, 0},0,
-	  1,1,1,1,0,0,0,1,  PLL_28,   5 },
-        { "ProVideo PV951", /* pic16c54 */
-          3, 1, 0, 2, 0, { 2, 3, 1, 1}, { 0, 0, 0, 0, 0},0,
-	  0,0,0,0,0,0,0,0,  PLL_28,   1 },
-	{ "Little OnAir TV",
-	  3, 1, 0, 2, 0xe00b, {2, 3, 1, 1},
-	  {0xff9ff6, 0xff9ff6, 0xff1ff7, 0, 0xff3ffc},0,
-	  0,0,0,0,0,0,0,0, PLL_NONE, -1 },
-
-	{ "Sigma TVII-FM",
-	  2, 1, 0, -1, 3, {2, 3, 1, 1}, {1, 1, 0, 2, 3},0,
-	  0,0,0,0,0,0,0,0, PLL_NONE, -1 },	
-	{ "MATRIX-Vision MV-Delta 2",
-	  5, 1, -1, 3, 0, { 2, 3, 1, 0, 0},{0 }, 0,
-	  0,0,0,0,0,0,0,0,  PLL_28, -1 },
-	{ "Zoltrix Genie TV",
-	  3, 1, 0, 2, 0xbcf03f, { 2, 3, 1, 1},
-	  { 0xbc803f, 0, 0xbcb03f, 0, 0xbcb03f}, 0,
-	  0,0,0,0,0,0,0,0,  PLL_28, 5 },
-	{ "Terratec TV/Radio+", /* Radio ?? */
-	  3, 1, 0, 2, 0x1f0000, { 2, 3, 1, 1},
-	  { 0xe2ffff, 0xebffff, 0, 0, 0xe0ffff, 0xe2ffff },0,
-	  0,0,0,0,0,0,0,0,  PLL_35,  1 },
-
-	/* 0x30 */
-	{ "Dynalink Magic TView ",
-	  3, 1, 0, 2, 15, { 2, 3, 1, 1}, {2,0,0,0,1},0,
-	  1,1,1,1,0,0,0,1,  PLL_28,  -1 },
-};
+/* ---- card 0x00 ---------------------------------- */
+	name:		" *** UNKNOWN *** ",
+	video_inputs:	4,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	muxsel:		{ 2, 3, 1, 0},
+	tuner_type:	-1,
+},{
+	name:		"MIRO PCTV",
+	video_inputs:	4,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	15,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 2, 0, 0, 0, 10},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"Hauppauge old",
+	video_inputs:	4,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	7,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0, 1, 2, 3, 4},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"STB",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	7,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 4, 0, 2, 3, 1},
+	no_msp34xx:	1,
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+
+/* ---- card 0x04 ---------------------------------- */
+	name:		"Intel",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		-1,
+	gpiomask:	7,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0, 1, 2, 3, 4},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"Diamond DTV2000",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	3,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0, 1, 0, 1, 3},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"AVerMedia TVPhone",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		3,
+	gpiomask:	15,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{12, 4,11,11, 0},
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+	name:		"MATRIX-Vision MV-Delta",
+	video_inputs:	5,
+	audio_inputs:	1,
+	tuner:		-1,
+	svhs:		3,
+	gpiomask:	0,
+	muxsel:		{ 2, 3, 1, 0, 0},
+	audiomux:	{0 },
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+
+/* ---- card 0x08 ---------------------------------- */
+	name:		"Fly Video II",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0xc00,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0, 0xc00, 0x800, 0x400, 0xc00, 0},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"TurboTV",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	3,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 1, 1, 2, 3, 0},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"Hauppauge new (bt878)",
+	video_inputs:	4,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	7,
+	muxsel:		{ 2, 0, 1, 1},
+	audiomux:	{ 0, 1, 2, 3, 4},
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+	name:		"MIRO PCTV pro",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	65551,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{1,65537, 0, 0,10},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+
+/* ---- card 0x0c ---------------------------------- */
+	name:		"ADS Technologies Channel Surfer TV",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	15,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 13, 14, 11, 7, 0, 0},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"AVerMedia TVCapture 98",
+	video_inputs:	3,
+	audio_inputs:	4,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	15,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 13, 14, 11, 7, 0, 0},
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	5,
+},{
+	name:		"Aimslab VHX",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	7,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0, 1, 2, 3, 4},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"Zoltrix TV-Max",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	15,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{0 , 0, 1 , 0, 10},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+
+/* ---- card 0x10 ---------------------------------- */
+	name:		"Pixelview PlayTV (bt878)",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0x01fe00,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0x01c000, 0, 0x018000, 0x014000, 0x002000, 0 },
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+	name:		"Leadtek WinView 601",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0x8300f8,
+	muxsel:		{ 2, 3, 1, 1,0},
+	audiomux:	{ 0x4fa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+	audio_hook:	winview_audio,
+},{
+	name:		"AVEC Intercapture",
+	video_inputs:	3,
+	audio_inputs:	2,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0,
+	muxsel:		{2, 3, 1, 1},
+	audiomux:	{1, 0, 0, 0, 0},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"LifeView FlyKit w/o Tuner",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		-1,
+	svhs:		-1,
+	gpiomask:	0x8dff00,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0 },
+	no_msp34xx:	1,
+	tuner_type:	-1,
+},{
+
+/* ---- card 0x14 ---------------------------------- */
+	name:		"CEI Raffles Card",
+	video_inputs:	3,
+	audio_inputs:	3,
+	tuner:		0,
+	svhs:		2,
+	muxsel:		{2, 3, 1, 1},
+	tuner_type:	-1,
+},{
+	name:		"Lucky Star Image World ConferenceTV",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0x00fffe07,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 131072, 1, 1638400, 3, 4},
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	TUNER_PHILIPS_PAL_I,
+},{
+	name:		"Phoebe Tv Master + FM",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0xc00,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{0, 1, 0x800, 0x400, 0xc00, 0},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"Modular Technology MM205 PCTV, bt878",
+	video_inputs:	2,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		-1,
+	gpiomask:	7,
+	muxsel:		{ 2, 3 },
+	audiomux:	{ 0, 0, 0, 0, 0 },
+	no_msp34xx:	1,
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+
+/* ---- card 0x18 ---------------------------------- */
+	name:		"Askey/Typhoon/Anubis Magic TView CPH051/061 (bt878)",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0xe00,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{0x400, 0x400, 0x400, 0x400, 0},
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+	name:		"Terratec/Vobis TV-Boostar",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	16777215,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 131072, 1, 1638400, 3,4},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"Newer Hauppauge WinCam (bt878)",
+	video_inputs:	4,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		3,
+	gpiomask:	7,
+	muxsel:		{ 2, 0, 1, 1},
+	audiomux:	{ 0, 1, 2, 3, 4},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"MAXI TV Video PCI2",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0xffff,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0, 1, 2, 3, 0xc00},
+	needs_tvaudio:	1,
+	tuner_type:	TUNER_PHILIPS_SECAM,
+},{
+
+/* ---- card 0x1c ---------------------------------- */
+	name:		"Terratec TerraTV+",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0x70000,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0x20000, 0x30000, 0x00000, 0x10000, 0x40000},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+	audio_hook:	terratv_audio,
+},{
+	name:		"Imagenation PXC200",
+	video_inputs:	5,
+	audio_inputs:	1,
+	tuner:		-1,
+	svhs:		4,
+	gpiomask:	0,
+	muxsel:		{ 2, 3, 1, 0, 0},
+	audiomux:	{ 0 },
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"FlyVideo 98",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0x8dfe00,
+	muxsel:		{2, 3, 1, 1},
+	audiomux:	{ 0, 0x8dff00, 0x8df700, 0x8de700, 0x8dff00, 0 },
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"iProTV",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	1,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 1, 0, 0, 0, 0 },
+	tuner_type:	-1,
+},{
+
+/* ---- card 0x20 ---------------------------------- */
+	name:		"Intel Create and Share PCI",
+	video_inputs:	4,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	7,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 4, 4, 4, 4, 4},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"Terratec TerraTValue",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0xffff00,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0x500, 0, 0x300, 0x900, 0x900},
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"Leadtek WinFast 2000",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0xfff000,
+	muxsel:		{ 2, 3, 1, 1,0},
+	audiomux:	{ 0x621000,0x6ddf07,0x621100,0x620000,0xE210000,0x620000},
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+	name:		"Chronos Video Shuttle II",
+	video_inputs:	3,
+	audio_inputs:	3,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0x1800,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0, 0, 0x1000, 0x1000, 0x0800},
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+
+/* ---- card 0x24 ---------------------------------- */
+	name:		"Typhoon TView TV/FM Tuner",
+	video_inputs:	3,
+	audio_inputs:	3,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0x1800,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0, 0x800, 0, 0, 0x1800, 0 },
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+	name:		"PixelView PlayTV pro",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0xff,
+	muxsel:		{ 2, 3, 1, 1 },
+	audiomux:	{ 0x21, 0x20, 0x24, 0x2c, 0x29, 0x29 },
+	no_msp34xx:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+	name:		"TView99 CPH063",
+	video_inputs:	4,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0x551e00,
+	muxsel:		{ 2, 3, 1, 0},
+	audiomux:	{ 0x551400, 0x551200, 0, 0, 0, 0x551200 },
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+	name:		"Pinnacle PCTV Rave",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0x03000F,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 2, 0, 0, 0, 1},
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+
+/* ---- card 0x28 ---------------------------------- */
+	name:		"STB2",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	7,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 4, 0, 2, 3, 1},
+	no_msp34xx:	1,
+	needs_tvaudio:	1,
+	tuner_type:	-1,
+},{
+	name:		"AVerMedia TVPhone 98",
+	video_inputs:	3,
+	audio_inputs:	4,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	4,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 13, 14, 11, 7, 0, 0},
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	5,
+	audio_hook:	avermedia_tvphone_audio,
+},{
+	name:		"ProVideo PV951", /* pic16c54 */
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0, 0, 0, 0, 0},
+	no_msp34xx:	1,
+	pll:		PLL_28,
+	tuner_type:	1,
+},{
+	name:		"Little OnAir TV",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0xe00b,
+	muxsel:		{2, 3, 1, 1},
+	audiomux:	{0xff9ff6, 0xff9ff6, 0xff1ff7, 0, 0xff3ffc},
+	no_msp34xx:	1,
+	tuner_type:	-1,
+},{
+
+/* ---- card 0x2c ---------------------------------- */
+	name:		"Sigma TVII-FM",
+	video_inputs:	2,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		-1,
+	gpiomask:	3,
+	muxsel:		{2, 3, 1, 1},
+	audiomux:	{1, 1, 0, 2, 3},
+	no_msp34xx:	1,
+	pll:		PLL_NONE,
+	tuner_type:	-1,
+},{
+	name:		"MATRIX-Vision MV-Delta 2",
+	video_inputs:	5,
+	audio_inputs:	1,
+	tuner:		-1,
+	svhs:		3,
+	gpiomask:	0,
+	muxsel:		{ 2, 3, 1, 0, 0},
+	audiomux:	{0 },
+	no_msp34xx:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+	name:		"Zoltrix Genie TV",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0xbcf03f,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0xbc803f, 0, 0xbcb03f, 0, 0xbcb03f},
+	no_msp34xx:	1,
+	pll:		PLL_28,
+	tuner_type:	5,
+},{
+	name:		"Terratec TV/Radio+",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0x1f0000,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0xe2ffff, 0xebffff, 0, 0, 0xe0ffff, 0xe2ffff },
+	no_msp34xx:	1,
+	pll:		PLL_35,
+	tuner_type:	1,
+},{
+
+/* ---- card 0x30 ---------------------------------- */
+	name:		"Dynalink Magic TView ",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	15,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{2,0,0,0,1},
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	-1,
+},{
+	name:		"GV-BCTV3",
+	video_inputs:	3,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0x010f00,
+	muxsel:		{2, 3, 0, 0},
+	audiomux:	{0x10000, 0, 0x10000, 0, 0, 0},
+	no_msp34xx:	1,
+	pll:		PLL_28,
+	tuner_type:	TUNER_ALPS_TSHC6_NTSC,
+	audio_hook:	gvbctv3pci_audio,
+},{
+	name:		"Prolink PV-BT878P+4E (PixelView PlayTV PAK)",
+	video_inputs:	4,
+	audio_inputs:	1,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0xAA0000,
+	muxsel:		{ 2,3,1,1 },
+	audiomux:	{ 0x20000, 0, 0x80000, 0x80000, 0xa8000, 0x46000  },
+	no_msp34xx:	1,
+	pll:		PLL_28,
+	tuner_type:	TUNER_PHILIPS_PAL_I,
+},{
+	name:           "Eagle Wireless Capricorn2 (bt878A)",
+	video_inputs:   4,
+	audio_inputs:   1,
+	tuner:          0,
+	svhs:           2,
+	gpiomask:       7,
+	muxsel:         { 2, 0, 1, 1},
+	audiomux:       { 0, 1, 2, 3, 4},
+	pll:            PLL_28,
+	tuner_type:     -1 /* TUNER_ALPS_TMDH2_NTSC */,
+},{
+
+/* ---- card 0x34 ---------------------------------- */
+	name:           "Pinnacle Studio PCTV Pro", /* David Härdeman <david@2gen.com> */
+	video_inputs:   3,
+	audio_inputs:   1,
+	tuner:          0,
+	svhs:           2,
+	gpiomask:       0x03000F,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 1, 65537, 0, 0, 10},
+	needs_tvaudio:  1,
+	pll:            PLL_28,
+	tuner_type:     -1,
+},{
+	name:		"Typhoon TView RDS", /* Claas Langbehn <claas@bigfoot.com> */
+	video_inputs:	3,
+	audio_inputs:	3,
+	tuner:		0,
+	svhs:		2,
+	gpiomask:	0xffff,
+	muxsel:		{ 2, 3, 1, 1},
+	audiomux:	{ 0xb002, 0, 0x12, 0x12, 0x3007 },
+	needs_tvaudio:	1,
+	pll:		PLL_28,
+	tuner_type:	TUNER_PHILIPS_PAL_I,
+}};
+
 const int bttv_num_tvcards = (sizeof(bttv_tvcards)/sizeof(struct tvcard));
 
 /* ----------------------------------------------------------------------- */
 
 static unsigned char eeprom_data[256];
 
-static void __devinit bttv_dump_eeprom(struct bttv *btv,int addr)
-{
-	int i;
-
-	if (bttv_verbose < 2)
-		return;
-	/* for debugging: dump eeprom to syslog */
-	printk(KERN_DEBUG "bttv%d: dump eeprom @ 0x%02x\n",btv->nr,addr);
-	for (i = 0; i < 256;) {
-		printk(KERN_DEBUG "  %02x:",i);
-		do {
-			printk(" %02x",eeprom_data[i++]);
-		} while (i % 16);
-		printk("\n");
-	}
-}
-
-static int __devinit bttv_idcard_eeprom(struct bttv *btv)
-{
-	unsigned id;
-	int i,n;
-
-	id = (eeprom_data[252] << 24) |
-		(eeprom_data[253] << 16) |
-		(eeprom_data[254] << 8)  |
-		(eeprom_data[255]);
-	if (id == 0 || id == 0xffffffff)
-	    return -1;
-
-	/* look for the card */
-	btv->cardid = id;
-	for (n = -1, i = 0; cards[i].id != 0; i++)
-		if (cards[i].id  == id)
-			n = i;
-
-	if (n != -1) {
-		/* found it */
-		printk(KERN_INFO "bttv%d: card id: %s (0x%08x) => card=%d\n",
-		       btv->nr,cards[n].name,id,cards[n].cardnr);
-		return cards[n].cardnr;
-	} else {
-		/* 404 */
-		printk(KERN_INFO "bttv%d: id: unknown (0x%08x)\n",
-		       btv->nr, id);
-		printk(KERN_INFO "please mail id, board name and "
-		       "the correct card= insmod option to "
-		       "kraxel@goldbach.in-berlin.de\n");
-		return -1;
-	}
-}
-
-#ifndef HAVE_TVAUDIO
-/* can tda9855.c handle this too maybe? */
-static void __devinit init_tda9840(struct bttv *btv)
-{
-        /* Horrible Hack */
-        bttv_I2CWrite(btv, I2C_TDA9840, TDA9840_SW, 0x2a, 1);  /* sound mode switching */
-        /* 00 - mute
-           10 - mono / averaged stereo
-           2a - stereo
-           12 - dual A
-           1a - dual AB
-           16 - dual BA
-           1e - dual B
-           7a - external */
-}
-#endif
-
+/*
+ * identify card
+ */
 void __devinit bttv_idcard(struct bttv *btv)
 {
-	int type,eeprom = 0;
-
-	btwrite(0, BT848_GPIO_OUT_EN);
-
-	/* try to autodetect the card */
-	/* many bt878 cards have a eeprom @ 0xa0 => read ID
-	   and try to identify it */
-	if (bttv_I2CRead(btv, I2C_HAUPEE, "eeprom") >= 0) {
-		eeprom = 0xa0;
-		bttv_readee(btv,eeprom_data,0xa0);
-		bttv_dump_eeprom(btv,0xa0); /* DEBUG */
-		type = bttv_idcard_eeprom(btv);
-		if (-1 != type) {
-			btv->type = type;
-		} else if (btv->id <= 849) {
-			/* for unknown bt848, assume old Hauppauge */
-			btv->type=BTTV_HAUPPAUGE;
-		}
+	unsigned int gpiobits;
+	int i,type;
+	unsigned short tmp;
+
+	/* read PCI subsystem ID */
+	pci_read_config_word(btv->dev, PCI_SUBSYSTEM_ID, &tmp);
+	btv->cardid = tmp << 16;
+	pci_read_config_word(btv->dev, PCI_SUBSYSTEM_VENDOR_ID, &tmp);
+	btv->cardid |= tmp;
+
+	if (0 != btv->cardid && 0xffffffff != btv->cardid) {
+		/* look for the card */
+		for (type = -1, i = 0; cards[i].id != 0; i++)
+			if (cards[i].id  == btv->cardid)
+				type = i;
 		
-	/* STB cards have a eeprom @ 0xae (old bt848) */
-	} else if (bttv_I2CRead(btv, I2C_STBEE, "eeprom")>=0) {
-		btv->type=BTTV_STB;
+		if (type != -1) {
+			/* found it */
+			printk(KERN_INFO "bttv%d: subsystem: %04x:%04x  =>  %s  =>  card=%d\n",
+			       btv->nr, btv->cardid & 0xffff, btv->cardid >> 16,
+			       cards[type].name,cards[type].cardnr);
+			btv->type = cards[type].cardnr;
+		} else {
+			/* 404 */
+			printk(KERN_INFO "bttv%d: subsystem: %04x:%04x (UNKNOWN)\n",
+			       btv->nr, btv->cardid&0xffff, btv->cardid>>16);
+			printk(KERN_DEBUG "please mail id, board name and "
+			       "the correct card= insmod option to "
+			       "kraxel@goldbach.in-berlin.de\n");
+		}
 	}
 
 	/* let the user override the autodetected type */
@@ -387,8 +819,39 @@
 	printk(KERN_INFO "bttv%d: model: %s [%s]\n",btv->nr,btv->video_dev.name,
 	       (card[btv->nr] >= 0 && card[btv->nr] < bttv_num_tvcards) ?
 	       "insmod option" : "autodetected");
-	
-        /* board specific initialisations */
+
+	/* overwrite gpio stuff ?? */
+	if (-1 == audioall && -1 == audiomux[0])
+		return;
+
+	if (-1 != audiomux[0]) {
+		gpiobits = 0;
+		for (i = 0; i < 5; i++) {
+			bttv_tvcards[btv->type].audiomux[i] = audiomux[i];
+			gpiobits |= audiomux[i];
+		}
+	} else {
+		gpiobits = audioall;
+		for (i = 0; i < 5; i++) {
+			bttv_tvcards[btv->type].audiomux[i] = audioall;
+		}
+	}
+	bttv_tvcards[btv->type].gpiomask = (-1 != gpiomask) ? gpiomask : gpiobits;
+	printk(KERN_INFO "bttv%d: gpio config override: mask=0x%x, mux=",
+	       btv->nr,bttv_tvcards[btv->type].gpiomask);
+	for (i = 0; i < 5; i++) {
+		printk("%s0x%x", i ? "," : "", bttv_tvcards[btv->type].audiomux[i]);
+	}
+	printk("\n");
+}
+
+/*
+ * (most) board specific initialisations goes here
+ */
+void __devinit bttv_init_card(struct bttv *btv)
+{
+	int eeprom = 0;
+
         if (btv->type == BTTV_MIRO || btv->type == BTTV_MIROPRO) {
                 /* auto detect tuner for MIRO cards */
                 btv->tuner_type=((btread(BT848_GPIO_DATA)>>10)-1)&7;
@@ -407,7 +870,6 @@
 			bttv_readee(btv,eeprom_data,0xa0);
 		}
                 hauppauge_eeprom(btv);
-                hauppauge_boot_msp34xx(btv);
         }
  	if (btv->type == BTTV_PXC200)
 		init_PXC200(btv);
@@ -419,6 +881,10 @@
 			btv->pll.pll_ifreq=28636363;
 			btv->pll.pll_crystal=BT848_IFORM_XT0;
 		}
+		if (PLL_35 == bttv_tvcards[btv->type].pll) {
+			btv->pll.pll_ifreq=35468950;
+			btv->pll.pll_crystal=BT848_IFORM_XT1;
+		}
 		/* insmod options can override */
                 switch (pll[btv->nr]) {
                 case 0: /* none */
@@ -427,18 +893,19 @@
 			btv->pll.pll_ofreq   = 0;
                         break;
                 case 1: /* 28 MHz */
+		case 28:
                         btv->pll.pll_ifreq   = 28636363;
 			btv->pll.pll_ofreq   = 0;
-                        btv->pll.pll_crystal=BT848_IFORM_XT0;
+                        btv->pll.pll_crystal = BT848_IFORM_XT0;
                         break;
                 case 2: /* 35 MHz */
+		case 35:
                         btv->pll.pll_ifreq   = 35468950;
 			btv->pll.pll_ofreq   = 0;
-                        btv->pll.pll_crystal=BT848_IFORM_XT1;
+                        btv->pll.pll_crystal = BT848_IFORM_XT1;
                         break;
                 }
         }
-	
 
 	/* tuner configuration */
  	if (-1 != bttv_tvcards[btv->type].tuner_type)
@@ -447,62 +914,25 @@
 		bttv_call_i2c_clients(btv,TUNER_SET_TYPE,&btv->tuner_type);
 
 	/* try to detect audio/fader chips */
-	if (bttv_tvcards[btv->type].msp34xx &&
+	if (!bttv_tvcards[btv->type].no_msp34xx &&
 	    bttv_I2CRead(btv, I2C_MSP3400, "MSP34xx") >=0) {
 		if (autoload)
 			request_module("msp3400");
 	}
 
-#ifndef HAVE_TVAUDIO
-	if (bttv_tvcards[btv->type].tda8425 &&
-	    bttv_I2CRead(btv, I2C_TDA8425, "TDA8425") >=0) {
-		if (autoload)
-			request_module("tda8425");
-        }
-
-	if (bttv_tvcards[btv->type].tda9840 &&
-	    bttv_I2CRead(btv, I2C_TDA9840, "TDA9840") >=0) {
-		init_tda9840(btv);
-                btv->audio_chip = TDA9840;
-		/* move this to a module too? */
-		init_tda9840(btv);
-	}
-
-	if (bttv_tvcards[btv->type].tda985x &&
-	    bttv_I2CRead(btv, I2C_TDA9850, "TDA985x") >=0) {
-		if (autoload)
-			request_module("tda985x");
-	}
-	if (bttv_tvcards[btv->type].tea63xx) {
-		if (autoload)
-			request_module("tea6300");
-	}
-#else
-	if (bttv_tvcards[btv->type].tda8425 ||
-	    bttv_tvcards[btv->type].tda9840 ||
-	    bttv_tvcards[btv->type].tda985x ||
-	    bttv_tvcards[btv->type].tea63xx) {
-		if (autoload)
-			request_module("tvaudio");
-	}
-#endif
-
-	if (bttv_tvcards[btv->type].tda9875 &&
-	    bttv_I2CRead(btv, I2C_TDA9875, "TDA9875") >=0) {
+	if (bttv_I2CRead(btv, I2C_TDA9875, "TDA9875") >=0) {
 		if (autoload)
 			request_module("tda9875");
 	}
 
-	if (bttv_tvcards[btv->type].tda7432 &&
-	    bttv_I2CRead(btv, I2C_TDA7432, "TDA7432") >=0) {
+	if (bttv_I2CRead(btv, I2C_TDA7432, "TDA7432") >=0) {
 		if (autoload)
 			request_module("tda7432");
 	}
 
-
-	if (bttv_tvcards[btv->type].tea64xx) {
+	if (bttv_tvcards[btv->type].needs_tvaudio) {
 		if (autoload)
-			request_module("tea6420");
+			request_module("tvaudio");
 	}
 
 	if (bttv_tvcards[btv->type].tuner != -1) {
@@ -574,40 +1004,25 @@
         {
                 btv->tuner_type = hauppauge_tuner[eeprom_data[9]].id;
 		if (bttv_verbose)
-			printk("bttv%d: Hauppauge eeprom: tuner=%s (%d)\n",btv->nr,
+			printk("bttv%d: Hauppauge eeprom: model=%d, tuner=%s (%d)\n",btv->nr,
+			       eeprom_data[12] << 8 | eeprom_data[11],
 			       hauppauge_tuner[eeprom_data[9]].name,btv->tuner_type);
         }
 }
 
-static void __devinit hauppauge_boot_msp34xx(struct bttv *btv)
+void __devinit bttv_hauppauge_boot_msp34xx(struct bttv *btv)
 {
-	int i;
-
         /* reset/enable the MSP on some Hauppauge cards */
         /* Thanks to Kyösti Mälkki (kmalkki@cc.hut.fi)! */
         btaor(32, ~32, BT848_GPIO_OUT_EN);
         btaor(0, ~32, BT848_GPIO_DATA);
         udelay(2500);
         btaor(32, ~32, BT848_GPIO_DATA);
+	if (bttv_gpio)
+		bttv_gpio_tracking(btv,"msp34xx");
 
 	if (bttv_verbose)
 		printk("bttv%d: Hauppauge msp34xx: reset line init\n",btv->nr);
-
-	/* look if the msp3400 driver is already registered */
-	for (i = 0; i < I2C_CLIENTS_MAX; i++) {
-		if (btv->i2c_clients[i] != NULL &&
-		    btv->i2c_clients[i]->driver->id == I2C_DRIVERID_MSP3400) {
-			return;
-		}
-	}
-
-	/* if not: look for the chip ... */
-	if (bttv_I2CRead(btv, I2C_MSP3400, "MSP34xx")) {
-		/* ... if found re-register to trigger a i2c bus rescan, */
-		/*     this time with the msp34xx chip activated */
-		i2c_bit_del_bus(&btv->i2c_adap);
-		i2c_bit_add_bus(&btv->i2c_adap);
-	}
 }
 
 
@@ -632,6 +1047,8 @@
 	/* GPIO inputs are pulled up, so no need to drive 
 	 * reset pin any longer */
 	btwrite(0,BT848_GPIO_OUT_EN);
+	if (bttv_gpio)
+		bttv_gpio_tracking(btv,"pxc200");
 
 	/*  we could/should try and reset/control the AD pots? but
 	    right now  we simply  turned off the crushing.  Without
@@ -716,6 +1133,8 @@
 	
 	/* better safe than sorry */
 	btaor((1<<TEA_CLK) | (1<<TEA_WE), ~((1<<TEA_CLK) | (1<<TEA_DATA) | (1<<TEA_WE) | (1<<TEA_MOST)), BT848_GPIO_OUT_EN);
+	if (bttv_gpio)
+		bttv_gpio_tracking(btv,"miro tea read");
 	
 	BUS_LOW(WE);
 	BUS_LOW(CLK);
@@ -753,7 +1172,10 @@
 	int reg = value;
 	
 	btaor((1<<TEA_CLK) | (1<<TEA_WE) | (1<<TEA_DATA), ~((1<<TEA_CLK) | (1<<TEA_DATA) | (1<<TEA_WE) | (1<<TEA_MOST)), BT848_GPIO_OUT_EN);
-	if (bttv_debug) printk("tea5757: write 0x%X\n", value);
+	if (bttv_gpio)
+		bttv_gpio_tracking(btv,"miro tea write");
+	if (bttv_debug)
+		printk("tea5757: write 0x%X\n", value);
 	BUS_LOW(CLK);
 	BUS_HIGH(WE);
 	for(i = 0; i < 25; i++)
@@ -778,6 +1200,7 @@
 	if (bttv_debug) tea_read(btv);
 }
 
+#if 0
 void init_tea5757(struct bttv *btv)
 {
 	BUS_LOW(CLK);
@@ -788,14 +1211,20 @@
 	/* normal mode for GPIO */
 	btaor(0, BT848_GPIO_DMA_CTL_GPIOMODE, BT848_GPIO_DMA_CTL);
 }
+#endif
 
 /* ----------------------------------------------------------------------- */
 /* winview                                                                 */
 
-void winview_setvol(struct bttv *btv, struct video_audio *v)
+void winview_audio(struct bttv *btv, struct video_audio *v, int set)
 {
 	/* PT2254A programming Jon Tombs, jon@gte.esi.us.es */
 	int bits_out, loops, vol, data;
+
+	if (!set) {
+		v->mode |= VIDEO_AUDIO_VOLUME;
+		return;
+	}
 	
 	/* 32 levels logarithmic */
 	vol = 32 - ((v->volume>>11));
@@ -826,6 +1255,68 @@
 	udelay(10);                     
 	data &= ~WINVIEW_PT2254_STROBE;
 	btwrite(data, BT848_GPIO_DATA);
+}
+
+/* ----------------------------------------------------------------------- */
+/* mono/stereo control for various cards (which don't use i2c chips but    */
+/* connect something to the GPIO pins                                      */
+
+static void
+gvbctv3pci_audio(struct bttv *btv, struct video_audio *v, int set)
+{
+	unsigned int con = 0;
+
+	if (set) {
+		btor(0x100, BT848_GPIO_OUT_EN);
+		if (v->mode & VIDEO_SOUND_LANG1)
+			con = 0x000;
+		if (v->mode & VIDEO_SOUND_LANG2)
+			con = 0x300;
+		if (v->mode & VIDEO_SOUND_STEREO)
+			con = 0x200;
+//		if (v->mode & VIDEO_SOUND_MONO)
+//			con = 0x100;
+		btaor(con, ~0x300, BT848_GPIO_DATA);
+	} else {
+		v->mode = VIDEO_SOUND_STEREO |
+			  VIDEO_SOUND_LANG1  | VIDEO_SOUND_LANG2;
+	}
+}
+
+/*
+ * Mario Medina Nussbaum <medisoft@alohabbs.org.mx>
+ *  I discover that on BT848_GPIO_DATA address a byte 0xcce enable stereo,
+ *  0xdde enables mono and 0xccd enables sap
+ *
+ * Petr Vandrovec <VANDROVE@vc.cvut.cz>
+ *  P.S.: At least mask in line above is wrong - GPIO pins 3,2 select
+ *  input/output sound connection, so both must be set for output mode.
+ *
+ */
+static void
+avermedia_tvphone_audio(struct bttv *btv, struct video_audio *v, int set)
+{
+	/* TODO */
+}
+
+static void
+terratv_audio(struct bttv *btv, struct video_audio *v, int set)
+{
+	unsigned int con = 0;
+
+	if (set) {
+		btor(0x180000, BT848_GPIO_OUT_EN);
+		if (v->mode & VIDEO_SOUND_LANG2)
+			con = 0x080000;
+		if (v->mode & VIDEO_SOUND_STEREO)
+			con = 0x180000;
+		btaor(con, ~0x180000, BT848_GPIO_DATA);
+		if (bttv_gpio)
+			bttv_gpio_tracking(btv,"terratv");
+	} else {
+		v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO |
+			VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
+	}
 }
 
 /*

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)