* lgdt3302.c, lgdt3302.h:

        - more whitespace cleanups.

        Signed-off-by: Michael Krufky <mkrufky@m1k.net>

1 files changed, 57 insertions, 63 deletions

diff --git a/v4l/lgdt3302.c b/v4l/lgdt3302.c
index 9043d5de5..6b549b61b 100644
--- a/v4l/lgdt3302.c
+++ b/v4l/lgdt3302.c
@@ -1,5 +1,5 @@
 /*
- * $Id: lgdt3302.c,v 1.7 2005/06/28 01:39:09 mkrufky Exp $
+ * $Id: lgdt3302.c,v 1.8 2005/06/28 12:34:14 mkrufky Exp $
  *
  *    Support for LGDT3302 (DViCO FustionHDTV 3 Gold) - VSB/QAM
  *
@@ -51,24 +51,21 @@
 static int debug = 0;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug,"Turn on/off lgdt3302 frontend debugging (default:off).");
-#define dprintk(args...) \
-do { \
-if (debug) printk(KERN_DEBUG "lgdt3302: " args); \
-} while (0)
+#define dprintk(args...) if (debug) printk(KERN_DEBUG "lgdt3302: " args);
 
 struct lgdt3302_state
 {
 	struct i2c_adapter* i2c;
 	struct dvb_frontend_ops ops;
-	
+
 	/* Configuration settings */
 	const struct lgdt3302_config* config;
-	
+
 	struct dvb_frontend frontend;
-	
+
 	/* Demodulator private data */
 	fe_modulation_t current_modulation;
-	
+
 	/* Tuner private data */
 	u32 current_frequency;
 };
@@ -82,7 +79,7 @@ static int i2c_writebytes (struct lgdt3302_state* state,
 		struct i2c_msg msg =
 			{ .addr = addr, .flags = 0, .buf = buf,  .len = len };
 		int err;
-		
+
 		if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
 			printk(KERN_WARNING "lgdt3302: %s error (addr %02x <- %02x, err == %i)\n", __FUNCTION__, addr, buf[0], err);
 			return -EREMOTEIO;
@@ -93,7 +90,7 @@ static int i2c_writebytes (struct lgdt3302_state* state,
 			{ .addr = addr, .flags = 0, .buf = tmp,  .len = 2 };
 		int err;
 		int i;
-		
+
 		for (i=1; i<len; i++) {
 			tmp[1] = buf[i];
 			if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
@@ -113,7 +110,7 @@ static int i2c_readbytes (struct lgdt3302_state* state,
 	struct i2c_msg msg =
 		{ .addr = addr, .flags = I2C_M_RD, .buf = buf,  .len = len };
 	int err;
-	
+
 	if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
 		printk(KERN_WARNING "lgdt3302: %s error (addr %02x, err == %i)\n", __FUNCTION__, addr, err);
 		return -EREMOTEIO;
@@ -155,7 +152,7 @@ int lgdt3302_SwReset(struct lgdt3302_state* state)
 		0x00 /* bit 6 is active low software reset
 		      *	bits 5-0 are 1 to mask interrupts */
 	};
-	
+
 	ret = i2c_writebytes(state, 
 			     state->config->demod_address,
 			     reset, sizeof(reset));
@@ -180,7 +177,7 @@ static int lgdt3302_init(struct dvb_frontend* fe)
 	 * cx88-cards.c arranges for the reset bit to be inactive (high).
 	 * Maybe there needs to be a callable function in cx88-core or
 	 * the caller of this function needs to do it. */
-	
+
 	dprintk("%s entered\n", __FUNCTION__);
 	return lgdt3302_SwReset((struct lgdt3302_state*) fe->demodulator_priv);
 }
@@ -195,9 +192,9 @@ static int lgdt3302_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
 	struct lgdt3302_state* state = (struct lgdt3302_state*) fe->demodulator_priv;
 	u8 buf[2];
-	
+
 	i2c_selectreadbytes(state, PACKET_ERR_COUNTER1, buf, sizeof(buf));
-	
+
 	*ucblocks = (buf[0] << 8) | buf[1];
 	return 0;
 }
@@ -208,9 +205,9 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
 	u8 buf[4];
 	struct lgdt3302_state* state = 
 		(struct lgdt3302_state*) fe->demodulator_priv;
-	
+
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10)
-	
+
 	/* Use 50MHz parameter values from spec sheet since xtal is 50 */
 	static u8 top_ctrl_cfg[]   = { TOP_CONTROL, 0x03 };
 	static u8 vsb_freq_cfg[]   = { VSB_CARRIER_FREQ0, 0x00, 0x87, 0x8e, 0x01 };
@@ -219,24 +216,24 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
 	static u8 agc_ctrl_cfg[]   = { AGC_FUNC_CTRL2, 0xc6, 0x40 };
 	static u8 agc_delay_cfg[]  = { AGC_DELAY0, 0x00, 0x00, 0x00 };
 	static u8 agc_loop_cfg[]   = { AGC_LOOP_BANDWIDTH0, 0x08, 0x9a };
-	
+
 	/* Change only if we are actually changing the modulation */
 	if (state->current_modulation != param->u.vsb.modulation) {
 		switch(param->u.vsb.modulation) {
 		case VSB_8:
 			dprintk("%s: VSB_8 MODE\n", __FUNCTION__);
-			
+
 			/* Select VSB mode and serial MPEG interface */
 			top_ctrl_cfg[1] = 0x07;
 			break;
-			
+
 		case QAM_64:
 			dprintk("%s: QAM_64 MODE\n", __FUNCTION__);
-			
+
 			/* Select QAM_64 mode and serial MPEG interface */
 			top_ctrl_cfg[1] = 0x04;
 			break;
-			
+
 		case QAM_256:
 			dprintk("%s: QAM_256 MODE\n", __FUNCTION__);
 			
@@ -248,28 +245,28 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
 			return -1;
 		}
 		/* Initializations common to all modes */
-		
+
 		/* Select the requested mode */
 		i2c_writebytes(state, state->config->demod_address,
 			       top_ctrl_cfg, sizeof(top_ctrl_cfg));
-		
+
 		/* Change the value of IFBW[11:0]
 		   of AGC IF/RF loop filter bandwidth register */
 		i2c_writebytes(state, state->config->demod_address,
 			       agc_rf_cfg, sizeof(agc_rf_cfg));
-		
+
 		/* Change the value of bit 6, 'nINAGCBY' and
 		   'NSSEL[1:0] of ACG function control register 2 */
 		/* Change the value of bit 6 'RFFIX'
 		   of AGC function control register 3 */
 		i2c_writebytes(state, state->config->demod_address,
 			       agc_ctrl_cfg, sizeof(agc_ctrl_cfg));
-		
+
 		/* Change the TPCLK pin polarity 
 		   data is valid on falling clock */
 		i2c_writebytes(state, state->config->demod_address,
 			       demux_ctrl_cfg, sizeof(demux_ctrl_cfg));
-		
+
 		if (param->u.vsb.modulation == VSB_8) {
 			/* Initialization for VSB modes only */
 			/* Change the value of NCOCTFV[25:0]of carrier
@@ -291,13 +288,13 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
 			agc_delay_cfg[3] = value & 0xff;
 			i2c_writebytes(state, state->config->demod_address,
 				       agc_delay_cfg, sizeof(agc_delay_cfg));
-			
+
 			/* Change the value of IAGCBW[15:8]
 			   of inner AGC loop filter bandwith */
 			i2c_writebytes(state, state->config->demod_address,
 				       agc_loop_cfg, sizeof(agc_loop_cfg));
 		}
-		
+
 		state->config->set_ts_params(fe, 0);
 		lgdt3302_SwReset(state);
 		state->current_modulation = param->u.vsb.modulation;
@@ -305,7 +302,7 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
 #else
 	printk("lgdt3302: %s: you need a newer kernel for this, sorry\n",__FUNCTION__);
 #endif
-	
+
 	/* Change only if we are actually changing the channel */
 	if (state->current_frequency != param->frequency) {
 		dvb_pll_configure(state->config->pll_desc, buf,
@@ -313,13 +310,13 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
 		dprintk("%s: tuner bytes: 0x%02x 0x%02x "
 			"0x%02x 0x%02x\n", __FUNCTION__, buf[0],buf[1],buf[2],buf[3]);
 		i2c_writebytes(state, state->config->pll_address ,buf, 4);
-		
+
 		/* Check the status of the tuner pll */
 		i2c_readbytes(state, state->config->pll_address, buf, 1);
 		dprintk("%s: tuner status byte = 0x%02x\n", __FUNCTION__, buf[0]);
-		
+
 		lgdt3302_SwReset(state);
-		
+
 		/* Update current frequency */
 		state->current_frequency = param->frequency;
 	}
@@ -334,43 +331,42 @@ static int lgdt3302_get_frontend(struct dvb_frontend* fe,
 	return 0;
 }
 
-
 static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
 	struct lgdt3302_state* state = (struct lgdt3302_state*) fe->demodulator_priv;
 	u8 buf[3];
-	
+
 	*status = 0; /* Reset status result */
-	
+
 	/* Check the status of the tuner pll */
 	i2c_readbytes(state, state->config->pll_address, buf, 1);
 	dprintk("%s: tuner status byte = 0x%02x\n", __FUNCTION__, buf[0]);
 	if ((buf[0] & 0xc0) != 0x40)
 		return 0; /* Tuner PLL not locked or not powered on */
-	
+
 	/*
 	 * You must set the Mask bits to 1 in the IRQ_MASK in order
 	 * to see that status bit in the IRQ_STATUS register.
 	 * This is done in SwReset();
 	 */
-	
+
 	/* signal status */
 	i2c_selectreadbytes(state, TOP_CONTROL, buf, sizeof(buf));
 	dprintk("%s: TOP_CONTROL = 0x%02x, IRO_MASK = 0x%02x, IRQ_STATUS = 0x%02x\n", __FUNCTION__, buf[0], buf[1], buf[2]);
 	if ((buf[2] & 0x30) == 0x10)
 		*status |= FE_HAS_SIGNAL;
-	
+
 	/* sync status */
 	if ((buf[2] & 0x03) == 0x01) {
 		*status |= FE_HAS_SYNC;
 	}
-	
+
 	/* FEC error status */
 	if ((buf[2] & 0x0c) == 0x08) {
 		*status |= FE_HAS_LOCK;
 		*status |= FE_HAS_VITERBI;
 	}
-	
+
 #if 0
 	/* Alternative method to check for a signal */
 	/* AGC status register */
@@ -381,7 +377,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
 		*status |= FE_HAS_SIGNAL;
 	else
 		return 0;
-	
+
 	/* Carrier Recovery Lock Status Register */
 	i2c_selectreadbytes(state, CARRIER_LOCK, buf, 1);
 	dprintk("%s: CARRIER_LOCK = 0x%02x\n", __FUNCTION__, buf[0]);
@@ -406,7 +402,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
 		printk("KERN_WARNING lgdt3302: %s: Modulation set to unsupported value\n", __FUNCTION__);
 	}
 #endif
-	
+
 	return 0;
 }
 
@@ -449,8 +445,7 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
 	 *   12   31
 	 *   13   30
 	 */
-	
-	
+
 	static const u32 SNR_EQ[] =
 		{ 1,     2,      2,      2, 3,      3,      4,     4,     5,     7,
 		  9,     11,     13,     17, 21,     26,     33,    41,    52,    65,
@@ -459,7 +454,7 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
 		  8098,  10195,  12835,  16158, 20341,  25608,  32238, 40585, 51094, 64323,
 		  80978, 101945, 128341, 161571, 203406, 256073, 0x40000
 		};
-	
+
 	static const u32 SNR_PH[] = 
 		{ 1,     2,      2,      2,      3,      3,     4,     5,     6,     8,
 		  10,    12,     15,     19,     23,     29, 37,    46,    58,    73,
@@ -467,20 +462,20 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
 		  909,   1144,   1440,   1813,   2282,   2873, 3617,  4553,  5732,  7216,
 		  9084,  11436,  14396,  18124,  22817,  28724,  36161, 45524, 57312, 72151,
 		  90833, 114351, 143960, 181235, 228161, 0x040000
-		}; 
+		};
 
 	static u8 buf[5];/* read data buffer */
 	static u32 noise;   /* noise value */
 	static u32 snr_db;  /* index into SNR_EQ[] */
 	struct lgdt3302_state* state = (struct lgdt3302_state*) fe->demodulator_priv;
-	
+
 	/* read both equalizer and pase tracker noise data */ 
 	i2c_selectreadbytes(state, EQPH_ERR0, buf, sizeof(buf));
-	
+
 	if (state->current_modulation == VSB_8) {
 		/* Equalizer Mean-Square Error Register for VSB */
 		noise = ((buf[0] & 7) << 16) | (buf[1] << 8) | buf[2];
-		
+
 		/* 
 		 * Look up noise value in table. 
 		 * A better search algorithm could be used...
@@ -495,7 +490,7 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
 	} else {
 		/* Phase Tracker Mean-Square Error Register for QAM */
 		noise = ((buf[0] & 7<<3) << 13) | (buf[3] << 8) | buf[4];
-		
+
 		/* Look up noise value in table. */
 		for (snr_db = 0; snr_db < sizeof(SNR_PH); snr_db++) {
 			if (noise < SNR_PH[snr_db]) {
@@ -509,7 +504,7 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
 	static u8 buf[5];/* read data buffer */
 	static u32 noise;   /* noise value */
 	struct lgdt3302_state* state = (struct lgdt3302_state*) fe->demodulator_priv;
-	
+
 	/* read both equalizer and pase tracker noise data */
 	i2c_selectreadbytes(state, EQPH_ERR0, buf, sizeof(buf));
 	
@@ -520,14 +515,14 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
 		/* Phase Tracker Mean-Square Error Register for QAM */
 		noise = ((buf[0] & 7<<3) << 13) | (buf[3] << 8) | buf[4];
 	}
-	
+
 	/* Small values for noise mean signal is better so invert noise */
 	/* Noise is 19 bit value so discard 3 LSB*/
 	*snr = ~noise>>3;
 #endif
-	
+
 	dprintk("%s: noise = 0x%05x, snr = %idb\n",__FUNCTION__, noise, *snr);
-	
+
 	return 0;
 }
 
@@ -540,7 +535,6 @@ static int lgdt3302_get_tune_settings(struct dvb_frontend* fe, struct dvb_fronte
 	return 0;
 }
 
-
 static void lgdt3302_release(struct dvb_frontend* fe)
 {
 	struct lgdt3302_state* state = (struct lgdt3302_state*) fe->demodulator_priv;
@@ -554,13 +548,13 @@ struct dvb_frontend* lgdt3302_attach(const struct lgdt3302_config* config,
 {
 	struct lgdt3302_state* state = NULL;
 	u8 buf[1];
-	
+
 	/* Allocate memory for the internal state */
 	state = (struct lgdt3302_state*) kmalloc(sizeof(struct lgdt3302_state), GFP_KERNEL);
 	if (state == NULL)
 		goto error;
 	memset(state,0,sizeof(*state));
-	
+
 	/* Setup the state */
 	state->config = config;
 	state->i2c = i2c;
@@ -568,16 +562,16 @@ struct dvb_frontend* lgdt3302_attach(const struct lgdt3302_config* config,
 	/* Verify communication with demod chip */
 	if (i2c_selectreadbytes(state, 2, buf, 1))
 		goto error;
-	
+
 	state->current_frequency = -1;
 	state->current_modulation = -1;
-	
+
 	/* Create dvb_frontend */
 	state->frontend.ops = &state->ops;
 	state->frontend.demodulator_priv = state;
 	return &state->frontend;
-	
- error:
+
+error:
 	if (state)
 		kfree(state);
 	dprintk("%s: ERROR\n",__FUNCTION__);