--- linux-2.4.0-test1-ac10/drivers/char/bt848.h	Sun Aug 23 22:32:25 1998
+++ linux/drivers/char/bt848.h	Sat Jun 17 16:32:48 2000
@@ -336,7 +336,7 @@
 
 
 
-/* Bt848A and Bt849 only !! */
+/* Bt848A and higher only !! */
 #define BT848_TGLB             0x080
 #define BT848_TGCTRL           0x084
 #define BT848_FCAP             0x0E8
--- linux-2.4.0-test1-ac10/drivers/char/bttv.c	Wed Jun  7 20:30:03 2000
+++ linux/drivers/char/bttv.c	Sat Jun 17 16:32:48 2000
@@ -92,7 +92,7 @@
 #endif
 static int triton1=0;
 static unsigned int radio[BTTV_MAX];
-static unsigned int card[BTTV_MAX] = { 0, 0, 0, 0 };
+static unsigned int card[BTTV_MAX] = { -1, -1, -1, -1 };
 static unsigned int pll[BTTV_MAX] = { -1, -1, -1, -1};
 static unsigned int fieldnr = 0;
 static unsigned int verbose = 1;
@@ -286,7 +286,7 @@
 	void * mem;
 	unsigned long adr, page;
 
-	mem=vmalloc(size);
+	mem=vmalloc_32(size);
 	if (mem) 
 	{
 		memset(mem, 0, size); /* Clear the ram out, no junk to the user */
@@ -659,7 +659,8 @@
 }
 
 
-/*	Imagenation L-Model PXC200 Framegrabber */
+/* ----------------------------------------------------------------------- */
+/*  Imagenation L-Model PXC200 Framegrabber */
 /*  This is basically the same procedure as 
  *  used by Alessandro Rubini in his pxc200 
  *  driver, but using BTTV functions */
@@ -670,7 +671,7 @@
 				    0x00 };
 	int i,tmp;
 
-	/*	Initialise GPIO-connevted stuff */
+	/* Initialise GPIO-connevted stuff */
 	btwrite(1<<13,BT848_GPIO_OUT_EN); /* Reset pin only */
 	btwrite(0,BT848_GPIO_DATA);
 	udelay(3);
@@ -708,6 +709,134 @@
 }
 
 /* ----------------------------------------------------------------------- */
+/* Miro Pro radio stuff -- the tea5757 is connected to some GPIO ports     */
+/*
+ * Copyright (c) 1999 Csaba Halasz <qgehali@uni-miskolc.hu>
+ * This code is placed under the terms of the GNU General Public License
+ *
+ * Brutally hacked by Dan Sheridan <dan.sheridan@contact.org.uk> djs52 8/3/00
+ */
+
+/* bus bits on the GPIO port */
+#define TEA_WE			6
+#define TEA_DATA		9
+#define TEA_CLK			8
+#define TEA_MOST		7
+
+#define BUS_LOW(bit) 	btand(~(1<<TEA_##bit), BT848_GPIO_DATA)
+#define BUS_HIGH(bit)	btor((1<<TEA_##bit), BT848_GPIO_DATA)
+#define BUS_IN(bit)	((btread(BT848_GPIO_DATA) >> TEA_##bit) & 1)
+
+/* TEA5757 register bits */
+#define TEA_FREQ		0:14
+#define TEA_BUFFER		15:15
+
+#define TEA_SIGNAL_STRENGTH	16:17
+
+#define TEA_PORT1		18:18
+#define TEA_PORT0		19:19
+
+#define TEA_BAND		20:21
+#define TEA_BAND_FM		0
+#define TEA_BAND_MW		1
+#define TEA_BAND_LW		2
+#define TEA_BAND_SW		3
+
+#define TEA_MONO		22:22
+#define TEA_ALLOW_STEREO	0
+#define TEA_FORCE_MONO		1
+
+#define TEA_SEARCH_DIRECTION	23:23
+#define TEA_SEARCH_DOWN		0
+#define TEA_SEARCH_UP		1
+
+#define TEA_STATUS		24:24
+#define TEA_STATUS_TUNED	0
+#define TEA_STATUS_SEARCHING	1
+
+/* Low-level stuff */
+int tea_read(struct bttv *btv)
+{
+    int value = 0;
+    long timeout;
+    int i;
+
+    /* 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);
+    
+    BUS_LOW(WE);
+    BUS_LOW(CLK);
+
+    udelay(10);
+    for(timeout = jiffies + 10 * HZ;
+	BUS_IN(DATA) == 1 && time_before(jiffies, timeout);
+	schedule());	/* 10 s */
+    if (BUS_IN(DATA) == 1) {
+	    printk("tea5757: read timeout\n");
+	    return -1;
+    }
+    for(timeout = jiffies + HZ/5;
+	BUS_IN(MOST) == 1 && time_before(jiffies, timeout);
+	schedule());	/* 0.2 s */
+    if (debug) printk("tea5757:");
+    for(i = 0; i < 24; i++)
+    {
+	udelay(10);
+	BUS_HIGH(CLK);
+	udelay(10);
+	if (debug) printk("%c", (BUS_IN(MOST) == 0)?'T':'-');
+	BUS_LOW(CLK);
+	value <<= 1;					
+	value |= (BUS_IN(DATA) == 0)?0:1;	/* MSB first */
+	if (debug) printk("%c", (BUS_IN(MOST) == 0)?'S':'M');
+    }
+    if (debug) printk("\ntea5757: read 0x%X\n", value);
+    return value;
+}
+
+int tea_write(struct bttv *btv, int value)
+{
+    int i;
+    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 (debug) printk("tea5757: write 0x%X\n", value);
+    BUS_LOW(CLK);
+    BUS_HIGH(WE);
+    for(i = 0; i < 25; i++)
+    {
+	if (reg & 0x1000000)
+	    BUS_HIGH(DATA);
+	else
+	    BUS_LOW(DATA);
+	reg <<= 1;
+	BUS_HIGH(CLK);
+	udelay(10);
+	BUS_LOW(CLK);
+	udelay(10);
+    }
+    BUS_LOW(WE);	/* unmute !!! */
+    return 0;
+}
+
+void tea5757_set_freq(struct bttv *btv, unsigned short freq)
+{
+	tea_write(btv, 5 * freq + 0x358); /* add 10.7MHz (see docs) */
+	if (debug) tea_read(btv);
+}
+
+void init_tea5757(struct bttv *btv)
+{
+	BUS_LOW(CLK);
+	BUS_LOW(WE); /* just to be on the safe side... */
+
+	/* software CLK (unused) */
+	btaor(0, BT848_GPIO_DMA_CTL_GPCLKMODE, BT848_GPIO_DMA_CTL);
+	/* normal mode for GPIO */
+	btaor(0, BT848_GPIO_DMA_CTL_GPIOMODE, BT848_GPIO_DMA_CTL);
+}
+
+/* ----------------------------------------------------------------------- */
 
 static struct CARD {
 	unsigned id;
@@ -716,13 +845,17 @@
 } cards[] __devinitdata = {
 	{ 0x00011002, BTTV_HAUPPAUGE878,  "ATI TV Wonder" },
 	{ 0x00011461, BTTV_AVPHONE98,     "AVerMedia TVPhone98" },
+	{ 0x00021461, BTTV_AVERMEDIA98,   "Avermedia TVCapture 98" },
 	{ 0x00031461, BTTV_AVPHONE98,     "AVerMedia TVPhone98" },
 	{ 0x00041461, BTTV_AVPHONE98,     "AVerMedia TVPhone98" },
 	{ 0x10b42636, BTTV_HAUPPAUGE878,  "STB ???" },
 	{ 0x1118153b, BTTV_TERRATVALUE,   "Terratec TV Value" },
+	{ 0x1123153b, BTTV_TERRATVRADIO,  "Terratec TV/Radio+" },
 	{ 0x1200bd11, BTTV_PINNACLERAVE,  "Pinnacle PCTV Rave" },
 	{ 0x13eb0070, BTTV_HAUPPAUGE878,  "Hauppauge WinTV" },
+#if 0 /* probably wrong */
 	{ 0x14610002, BTTV_AVERMEDIA98,   "Avermedia TVCapture 98" },
+#endif
 	{ 0x18501851, BTTV_CHRONOS_VS2,   "Chronos Video Shuttle II" },
 	{ 0x18521852, BTTV_TYPHOON_TVIEW, "Typhoon TView TV/FM Tuner" },
 	{ 0x263610b4, BTTV_STB2,          "STB TV PCI FM, P/N 6000704" },
@@ -730,6 +863,7 @@
 	{ 0x300014ff, BTTV_MAGICTVIEW061, "TView 99 (CPH061)" },
 	{ 0x3002144f, BTTV_MAGICTVIEW061, "Askey Magic TView" },
 	{ 0x300214ff, BTTV_PHOEBE_TVMAS,  "Phoebe TV Master" },
+	{ 0x400a15b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV" },
 	{ 0x402010fc, 0 /* no tvcards entry yet */, "I-O Data Co. GV-BCV3/PCI" },
 	{ 0x6606217d, BTTV_WINFAST2000,   "Leadtek WinFast TV 2000" },
 	{ 0, -1, NULL }
@@ -803,7 +937,7 @@
 	  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",
@@ -926,6 +1060,17 @@
 	{ "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, 0, 0, 0, 0xe0ffff, 0xe2ffff },0,
+	  0,0,0,0,0,0,0,0,  PLL_35, 1 },
 };
 #define TVCARDS (sizeof(tvcards)/sizeof(struct tvcard))
 
@@ -966,12 +1111,8 @@
 
 	if (n != -1) {
 		/* found it */
-		printk(KERN_INFO "bttv%d: id: %s (0x%08x)\n",
-		       btv->nr,cards[n].name,id);
-		if (verbose)
-			printk(KERN_INFO "bttv%d:   => card=%d (%s)\n",
-			       btv->nr,cards[n].cardnr,
-			       tvcards[cards[n].cardnr].name);
+		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 */
@@ -2020,7 +2161,7 @@
 /*
  *	Open a bttv card. Right now the flags stuff is just playing
  */
- 
+
 static int bttv_open(struct video_device *dev, int flags)
 {
 	struct bttv *btv = (struct bttv *)dev;
@@ -2477,6 +2618,8 @@
 			return -EFAULT;
 		btv->win.freq=v;
 		call_i2c_clients(btv,cmd,&v);
+		if (btv->type == BTTV_MIROPRO && btv->radio)
+			tea5757_set_freq(btv,v);
 		return 0;
 	}
 	
@@ -3115,52 +3258,48 @@
 
 	btwrite(0, BT848_GPIO_OUT_EN);
 
-	/* Default the card to the user-selected one. */
-	if (card[btv->nr] >= 0 && card[btv->nr] < TVCARDS)
-		btv->type=card[btv->nr];
-
-	/* If we were asked to auto-detect, then do so! */
-	if (btv->type == BTTV_UNKNOWN) {
-			
-		/* many bt878 cards have a eeprom @ 0xa0 => read ID
-		   and try to identify it */
-		if (I2CRead(btv, I2C_HAUPEE, "eeprom") >= 0) {
-			eeprom = 0xa0;
-			readee(btv,eeprom_data,0xa0);
-			dump_eeprom(btv,0xa0); /* DEBUG */
-			type = idcard_eeprom(btv);
-			if (-1 != type) {
-				btv->type = type;
-			} else if (btv->id <= 849) {
-				/* for unknown bt848, assume old Hauppauge */
-			        btv->type=BTTV_HAUPPAUGE;
-			}
-
-		/* STB cards have a eeprom @ 0xae (old bt848) */
-		} else if (I2CRead(btv, I2C_STBEE, "eeprom")>=0) {
-			btv->type=BTTV_STB;
+	/* try to autodetect the card */
+	/* many bt878 cards have a eeprom @ 0xa0 => read ID
+	   and try to identify it */
+	if (I2CRead(btv, I2C_HAUPEE, "eeprom") >= 0) {
+		eeprom = 0xa0;
+		readee(btv,eeprom_data,0xa0);
+		dump_eeprom(btv,0xa0); /* DEBUG */
+		type = idcard_eeprom(btv);
+		if (-1 != type) {
+			btv->type = type;
+		} else if (btv->id <= 849) {
+			/* for unknown bt848, assume old Hauppauge */
+			btv->type=BTTV_HAUPPAUGE;
 		}
-
-#if 0
-		/* check for msp34xx */
-			if (I2CRead(btv, 0x80, "msp3400")>=0)
-				btv->type = BTTV_MIROPRO;
-			else
-				btv->type = BTTV_MIRO;
-#endif
+		
+	/* STB cards have a eeprom @ 0xae (old bt848) */
+	} else if (I2CRead(btv, I2C_STBEE, "eeprom")>=0) {
+		btv->type=BTTV_STB;
 	}
 
-	/* print which board we have found */
-	sprintf(btv->video_dev.name,"BT%d%s(%.22s)",
+	/* let the user override the autodetected type */
+	if (card[btv->nr] >= 0 && card[btv->nr] < TVCARDS)
+		btv->type=card[btv->nr];
+	
+	/* print which card config we are using */
+	sprintf(btv->video_dev.name,"BT%d%s(%.23s)",
 		btv->id,
 		(btv->id==848 && btv->revision==0x12) ? "A" : "",
 		tvcards[btv->type].name);
-	printk(KERN_INFO "bttv%d: model: %s\n",btv->nr,btv->video_dev.name);
+	printk(KERN_INFO "bttv%d: model: %s [%s]\n",btv->nr,btv->video_dev.name,
+	       (card[btv->nr] >= 0 && card[btv->nr] < TVCARDS) ?
+	       "insmod option" : "autodetected");
 	
         /* board specific initialisations */
         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;
+		if (btv->type == BTTV_MIROPRO) {
+			if (verbose)
+				printk(KERN_INFO "Initializing TEA5757...\n");
+			init_tea5757(btv);
+		}
         }
         if (btv->type == BTTV_HAUPPAUGE || btv->type == BTTV_HAUPPAUGE878) {
 		/* pick up some config infos from the eeprom */
@@ -3174,7 +3313,6 @@
  	if (btv->type == BTTV_PXC200)
 		init_PXC200(btv);
 
-
 	/* pll configuration */
         if (!(btv->id==848 && btv->revision==0x11)) {
 		/* defaults from card list */
@@ -3202,7 +3340,7 @@
                 }
         }
 	
-	
+
 	/* tuner configuration */
  	if (-1 != tvcards[btv->type].tuner_type)
                 btv->tuner_type = tvcards[btv->type].tuner_type;
@@ -3466,7 +3604,7 @@
 	btv->bus_vbi_even=virt_to_bus(btv->risc_jmp+6);
 
 	btwrite(virt_to_bus(btv->risc_jmp+2), BT848_RISC_STRT_ADD);
-	btv->vbibuf=(unsigned char *) vmalloc(VBIBUF_SIZE);
+	btv->vbibuf=(unsigned char *) vmalloc_32(VBIBUF_SIZE);
 	if (!btv->vbibuf) 
 		return -1;
 	if (!(btv->gbuf = kmalloc(sizeof(struct bttv_gbuf)*gbuffers,GFP_KERNEL)))
--- linux-2.4.0-test1-ac10/drivers/char/bttv.h	Wed Jun  7 23:26:35 2000
+++ linux/drivers/char/bttv.h	Sat Jun 17 16:32:48 2000
@@ -21,7 +21,7 @@
 #ifndef _BTTV_H_
 #define _BTTV_H_
 
-#define BTTV_VERSION_CODE KERNEL_VERSION(0,7,31)
+#define BTTV_VERSION_CODE KERNEL_VERSION(0,7,33)
 
 #ifndef PCI_GET_DRIVER_DATA
 # define PCI_GET_DRIVER_DATA(pdev)         ((pdev)->driver_data)
@@ -283,6 +283,9 @@
 #define BTTV_PV951         0x2a
 #define BTTV_ONAIR_TV      0x2b
 #define BTTV_SIGMA_TVII_FM 0x2c
+#define BTTV_MATRIX_VISION2 0x2d
+#define BTTV_ZOLTRIX_GENIE 0x2e
+#define BTTV_TERRATVRADIO  0x2f
 
 #define PLL_NONE 0
 #define PLL_28   1
@@ -306,7 +309,7 @@
 #define I2C_TDA7432        0x8a
 #define I2C_TDA8425        0x82
 #define I2C_TDA9840        0x84
-#define I2C_TDA9850        0xb6
+#define I2C_TDA9850        0xb6 /* also used by 9855,9873 */
 #define I2C_TDA9875        0xb0
 #define I2C_HAUPEE         0xa0
 #define I2C_STBEE          0xae
--- linux-2.4.0-test1-ac10/Documentation/video4linux/bttv/CARDLIST	Wed Jun  7 20:30:00 2000
+++ linux/Documentation/video4linux/bttv/CARDLIST	Sat Jun 17 16:32:49 2000
@@ -44,6 +44,9 @@
   card=42 - ProVideo PV951
   card=43 - Little OnAir TV
   card=44 - Sigma TVII-FM
+  card=45 - MATRIX-Vision MV-Delta 2
+  card=46 - Zoltrix Genie TV
+  card=47 - Terratec TV/Radio+
 
 tuner.o
   type=0 - Temic PAL