[linux-dvb] Patch 16 / 50: code cleanup for dst

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


#Applies against: 2.6.17
#Signed-off-by: Uwe Bugla <uwe.bugla at gmx.de>
#Changes: fix type and / or tab errors, extracts documentary parts out of #the module and transforms them into a documentary text file
--- a/drivers/media/dvb/bt8xx/dst.c	2006-05-27 14:03:00
+++ b/drivers/media/dvb/bt8xx/dst.c	2006-05-28 12:23:00
@@ -566,41 +566,6 @@
 
 	return 0;
 }
-
-/*
-	Known cards list
-	Satellite
-	-------------------
-		  200103A
-	VP-1020   DST-MOT	LG(old), TS=188
-
-	VP-1020   DST-03T	LG(new), TS=204
-	VP-1022   DST-03T	LG(new), TS=204
-	VP-1025   DST-03T	LG(new), TS=204
-
-	VP-1030   DSTMCI,	LG(new), TS=188
-	VP-1032   DSTMCI,	LG(new), TS=188
-
-	Cable
-	-------------------
-	VP-2030   DCT-CI,	Samsung, TS=204
-	VP-2021   DCT-CI,	Unknown, TS=204
-	VP-2031   DCT-CI,	Philips, TS=188
-	VP-2040   DCT-CI,	Philips, TS=188, with CA daughter board
-	VP-2040   DCT-CI,	Philips, TS=204, without CA daughter board
-
-	Terrestrial
-	-------------------
-	VP-3050  DTTNXT			 TS=188
-	VP-3040  DTT-CI,	Philips, TS=188
-	VP-3040  DTT-CI,	Philips, TS=204
-
-	ATSC
-	-------------------
-	VP-3220  ATSCDI,		 TS=188
-	VP-3250  ATSCAD,		 TS=188
-
-*/
 
 static struct dst_types dst_tlist[] = {
 	{
@@ -1016,7 +981,7 @@
 	mutex_unlock(&state->dst_mutex);
 	return 0;
 
-error:
+ error:
 	mutex_unlock(&state->dst_mutex);
 	return -EIO;
 
@@ -1027,7 +992,6 @@
 {
 	int retval;
 	u8 get_signal[] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb };
-	//dprintk("%s: Getting Signal strength and other parameters\n", __FUNCTION__);
 	if ((state->diseq_flags & ATTEMPT_TUNE) == 0) {
 		state->decode_lock = state->decode_strength = state->decode_snr = 0;
 		return 0;
@@ -1159,28 +1123,15 @@
 	}
 	state->diseq_flags |= ATTEMPT_TUNE;
 	retval = dst_get_tuna(state);
-werr:
+ werr:
 	mutex_unlock(&state->dst_mutex);
 	return retval;
 
-error:
+ error:
 	mutex_unlock(&state->dst_mutex);
 	return -EIO;
 }
 
-/*
- * line22k0    0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x00
- * line22k1    0x00, 0x09, 0x01, 0xff, 0x01, 0x00, 0x00, 0x00
- * line22k2    0x00, 0x09, 0x02, 0xff, 0x01, 0x00, 0x00, 0x00
- * tone        0x00, 0x09, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00
- * data        0x00, 0x09, 0xff, 0x01, 0x01, 0x00, 0x00, 0x00
- * power_off   0x00, 0x09, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00
- * power_on    0x00, 0x09, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00
- * Diseqc 1    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf0, 0xec
- * Diseqc 2    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf4, 0xe8
- * Diseqc 3    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf8, 0xe4
- * Diseqc 4    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xfc, 0xe0
- */
 
 static int dst_set_diseqc(struct dvb_frontend *fe, struct dvb_diseqc_master_cmd *cmd)
 {
@@ -1313,7 +1264,6 @@
 
 	*status = 0;
 	if (state->diseq_flags & HAS_LOCK) {
-//		dst_get_signal(state);	// don't require(?) to ask MCU
 		if (state->decode_lock)
 			*status |= FE_HAS_LOCK | FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_SYNC | FE_HAS_VITERBI;
 	}
@@ -1473,7 +1423,6 @@
 		.frequency_tolerance = 29500,
 		.symbol_rate_min = 1000000,
 		.symbol_rate_max = 45000000,
-	/*     . symbol_rate_tolerance	=	???,*/
 		.caps = FE_CAN_FEC_AUTO | FE_CAN_QPSK
 	},
 
@@ -1500,7 +1449,6 @@
 		.frequency_max = 858000000,
 		.symbol_rate_min = 1000000,
 		.symbol_rate_max = 45000000,
-	/*     . symbol_rate_tolerance	=	???,*/
 		.caps = FE_CAN_FEC_AUTO | FE_CAN_QAM_AUTO
 	},
 
--- a/dev/null				2006-05-27 14:03:00
+++ b/Documentation/dvb/dst.txt		2006-05-28 12:23:00
@@ -0,0 +1,43 @@
+Known cards list
+Satellite
+-----------------
+	  200103A
+VP-1020   DST-MOT	LG(old), TS=188
+
+VP-1020   DST-03T	LG(new), TS=204
+VP-1022   DST-03T	LG(new), TS=204
+VP-1025   DST-03T	LG(new), TS=204
+VP-1030   DSTMCI,	LG(new), TS=188
+VP-1032   DSTMCI,	LG(new), TS=188
+
+Cable
+-----------------
+VP-2030   DCT-CI,	Samsung, TS=204
+VP-2021   DCT-CI,	Unknown, TS=204
+VP-2031   DCT-CI,	Philips, TS=188
+VP-2040   DCT-CI,	Philips, TS=188, with CA daughter board
+VP-2040   DCT-CI,	Philips, TS=204, without CA daughter board
+
+Terrestrial
+-----------------
+VP-3050   DTTNXT		 TS=188
+VP-3040   DTT-CI,	Philips, TS=188
+VP-3040   DTT-CI,	Philips, TS=204
+
+ATSC
+-----------------
+VP-3220   ATSCDI,		 TS=188
+VP-3250   ATSCAD,		 TS=188
+
+
+line22k0    0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x00
+line22k1    0x00, 0x09, 0x01, 0xff, 0x01, 0x00, 0x00, 0x00
+line22k2    0x00, 0x09, 0x02, 0xff, 0x01, 0x00, 0x00, 0x00
+tone        0x00, 0x09, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00
+data        0x00, 0x09, 0xff, 0x01, 0x01, 0x00, 0x00, 0x00
+power_off   0x00, 0x09, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00
+power_on    0x00, 0x09, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00
+Diseqc 1    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf0, 0xec
+Diseqc 2    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf4, 0xe8
+Diseqc 3    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf8, 0xe4
+Diseqc 4    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xfc, 0xe0

-- 


"Feel free" – 10 GB Mailbox, 100 FreeSMS/Monat ...
Jetzt GMX TopMail testen: http://www.gmx.net/de/go/topmail



More information about the linux-dvb mailing list