[linux-dvb] Patch 44 / 50: code cleanup for tveeprom

Uwe Bugla uwe.bugla at gmx.de
Fri Jun 23 17:36:13 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/tveeprom.c	2006-05-27 14:03:00
+++ b/drivers/media/video/tveeprom.c	2006-05-29 17:45:00
@@ -3,16 +3,11 @@
  *
  * Data and decoding routines shamelessly borrowed from bttv-cards.c
  * eeprom access routine shamelessly borrowed from bttv-if.c
- * which are:
-
     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>
-
  * Adjustments to fit a more general model and all bugs:
-
 	Copyright (C) 2003 John Klar <linpvr at projectplasma.com>
-
  * 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
  * the Free Software Foundation; either version 2 of the License, or
@@ -347,34 +342,10 @@
 void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
 				unsigned char *eeprom_data)
 {
-	/* ----------------------------------------------
-	** The hauppauge eeprom format is tagged
-	**
-	** if packet[0] == 0x84, then packet[0..1] == length
-	** else length = packet[0] & 3f;
-	** if packet[0] & f8 == f8, then EOD and packet[1] == checksum
-	**
-	** In our (ivtv) case we're interested in the following:
-	** tuner type:   tag [00].05 or [0a].01 (index into hauppauge_tuner)
-	** tuner fmts:   tag [00].04 or [0a].00 (bitmask index into hauppauge_tuner_fmt)
-	** radio:        tag [00].{last} or [0e].00  (bitmask.  bit2=FM)
-	** audio proc:   tag [02].01 or [05].00 (mask with 0x7f)
-	** decoder proc: tag [09].01)
-
-	** Fun info:
-	** model:      tag [00].07-08 or [06].00-01
-	** revision:   tag [00].09-0b or [06].04-06
-	** serial#:    tag [01].05-07 or [04].04-06
-
-	** # of inputs/outputs ???
-	*/
-
 	int i, j, len, done, beenhere, tag,start;
-
 	int tuner1 = 0, t_format1 = 0, audioic=-1;
 	char *t_name1 = NULL;
 	const char *t_fmt_name1[8] = { " none", "", "", "", "", "", "", "" };
-
 	int tuner2 = 0, t_format2 = 0;
 	char *t_name2 = NULL;
 	const char *t_fmt_name2[8] = { " none", "", "", "", "", "", "", "" };
@@ -540,9 +511,6 @@
 			made. */
 			break;
 
-		/* case 0x0c: tag 'Balun' */
-		/* case 0x0d: tag 'Teletext' */
-
 		case 0x0e:
 			/* tag: 'Radio' */
 			tvee->has_radio = eeprom_data[i+1];
@@ -553,10 +521,6 @@
 			tvee->has_ir = eeprom_data[i+1];
 			break;
 
-		/* case 0x10: tag 'VBIInfo' */
-		/* case 0x11: tag 'QCInfo' */
-		/* case 0x12: tag 'InfoBits' */
-
 		default:
 			tveeprom_dbg("Not sure what to do with tag [%02x]\n", tag);
 			/* dump the rest of the packet? */
@@ -793,12 +757,5 @@
 {
 	i2c_del_driver(&i2c_driver_tveeprom);
 }
-
 module_init(tveeprom_init);
 module_exit(tveeprom_exit);
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */

-- 


Der GMX SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen!
Ideal für Modem und ISDN: http://www.gmx.net/de/go/smartsurfer



More information about the linux-dvb mailing list