[linux-dvb] Patch 4 / 50: code cleanup for bttvcards

Uwe Bugla uwe.bugla at gmx.de
Fri Jun 23 16:37:15 CEST 2006


#Applies against: 2.6.17
#Signed-off-by: Uwe Bugla <uwe.bugla at gmx.de>
#Changes: updates Email addresses, wipes out uncommented material
--- a/drivers/media/video/bt8xx/bttv-cards.c	2006-05-27 14:03:00
+++ b/drivers/media/video/bt8xx/bttv-cards.c	2006-05-29 20:59:00
@@ -7,7 +7,7 @@
 
     Copyright (C) 1996,97,98 Ralph  Metzler (rjkm at thp.uni-koeln.de)
 			   & Marcus Metzler (mocm at thp.uni-koeln.de)
-    (c) 1999-2001 Gerd Knorr <kraxel at goldbach.in-berlin.de>
+    (c) 1999-2001 Gerd Knorr <kraxel at bytesex.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -204,8 +204,6 @@
 
 	{ 0x1123153b, BTTV_BOARD_TERRATVRADIO,  "Terratec TV Radio+" },
 	{ 0x1127153b, BTTV_BOARD_TERRATV,       "Terratec TV+ (V1.05)"    },
-	/* clashes with FlyVideo
-	 *{ 0x18521852, BTTV_BOARD_TERRATV,     "Terratec TV+ (V1.10)"    }, */
 	{ 0x1134153b, BTTV_BOARD_TERRATVALUE,   "Terratec TValue (LR102)" },
 	{ 0x1135153b, BTTV_BOARD_TERRATVALUER,  "Terratec TValue Radio" }, /* LR102 */
 	{ 0x5018153b, BTTV_BOARD_TERRATVALUE,   "Terratec TValue" },       /* ?? */
@@ -289,14 +287,7 @@
 	{ 0x01061805, BTTV_BOARD_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #2" },
 	{ 0x01071805, BTTV_BOARD_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #3" },
 	{ 0x01081805, BTTV_BOARD_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #4" },
-
 	{ 0x15409511, BTTV_BOARD_ACORP_Y878F, "Acorp Y878F" },
-
-	/* likely broken, vendor id doesn't match the other magic views ...
-	 * { 0xa0fca04f, BTTV_BOARD_MAGICTVIEW063, "Guillemot Maxi TV Video 3" }, */
-
-	/* Duplicate PCI ID, reconfigure for this board during the eeprom read.
-	* { 0x13eb0070, BTTV_BOARD_HAUPPAUGE_IMPACTVCB,  "Hauppauge ImpactVCB" }, */
 
 	/* DVB cards (using pci function .1 for mpeg data xfer) */
 	{ 0x001c11bd, BTTV_BOARD_PINNACLESAT,   "Pinnacle PCTV Sat" },
@@ -1524,7 +1515,7 @@
 	/* ---- card 0x44 ---------------------------------- */
 	[BTTV_BOARD_VOODOOTV_FM] = {
 		.name           = "3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA)",
-		/* try "insmod msp3400 simple=0" if you have
+		/* try "options msp3400 simple=0" if you have
 		* sound problems with this card. */
 		.video_inputs   = 4,
 		.audio_inputs   = 1,
@@ -3072,8 +3063,6 @@
 
 	has_remote          =   gpio & 0x800000;
 	has_radio	    =   gpio & 0x400000;
-	/*   unknown                   0x200000;
-	 *   unknown2                  0x100000; */
 	is_capture_only     = !(gpio & 0x008000); /* GPIO15 */
 	has_tda9820_tda9821 = !(gpio & 0x004000);
 	is_lr90             = !(gpio & 0x002000); /* else LR26/LR50 (LR38/LR51 f. capture only) */
@@ -4292,8 +4281,6 @@
 			con = 0x300;
 		if (v->mode & VIDEO_SOUND_STEREO)
 			con = 0x200;
-/*		if (v->mode & VIDEO_SOUND_MONO)
- *			con = 0x100; */
 		gpio_bits(0x300, con);
 	} else {
 		v->mode = VIDEO_SOUND_STEREO |
@@ -4586,11 +4573,7 @@
 adtvk503_audio(struct bttv *btv, struct video_audio *v, int set)
 {
 	unsigned int con = 0xffffff;
-
-	/* btaor(0x1e0000, ~0x1e0000, BT848_GPIO_OUT_EN); */
-
 	if (set) {
-		/* btor(***, BT848_GPIO_OUT_EN); */
 		if (v->mode & VIDEO_SOUND_LANG1)
 			con = 0x00000000;
 		if (v->mode & VIDEO_SOUND_LANG2)
@@ -4947,16 +4930,10 @@
 	  printk(KERN_DEBUG "bttv%d: PXC200_muxsel: not PXC200F rc:%d \n", btv->c.nr,rc);
 	  return;
 	}
-
-
 	/* The multiplexer in the 200F is handled by the GPIO port */
 	/* get correct mapping between inputs  */
-	/*  mux = bttv_tvcards[btv->type].muxsel[input] & 3; */
-	/* ** not needed!?   */
 	mux = input;
-
 	/* make sure output pins are enabled */
-	/* bitmask=0x30f; */
 	bitmask=0x302;
 	/* check whether we have a PXC200A */
 	if (btv->cardid == PX_PXC200A_CARDID)  {
@@ -5069,10 +5046,3 @@
 		pci_write_config_byte(btv->c.pci, PCI_LATENCY_TIMER, latency);
 	return 0;
 }
-
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */

-- 


Echte DSL-Flatrate dauerhaft für 0,- Euro*!
"Feel free" mit GMX DSL! http://www.gmx.net/de/go/dsl



More information about the linux-dvb mailing list