X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fdvb%2Ffrontends%2Fnxt200x.c;fp=drivers%2Fmedia%2Fdvb%2Ffrontends%2Fnxt200x.c;h=9e35353945099f69d073c24996802fa57ab53701;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=87c286ee6a00a2dbef8094ad1174a45debb1b320;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index 87c286ee6..9e3535394 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -55,6 +55,7 @@
 struct nxt200x_state {
 
 	struct i2c_adapter* i2c;
+	struct dvb_frontend_ops ops;
 	const struct nxt200x_config* config;
 	struct dvb_frontend frontend;
 
@@ -332,17 +333,17 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
 
 	dprintk("%s\n", __FUNCTION__);
 
-	dprintk("Tuner Bytes: %02X %02X %02X %02X\n", data[1], data[2], data[3], data[4]);
+	dprintk("Tuner Bytes: %02X %02X %02X %02X\n", data[0], data[1], data[2], data[3]);
 
 	/* if NXT2004, write directly to tuner. if NXT2002, write through NXT chip.
 	 * direct write is required for Philips TUV1236D and ALPS TDHU2 */
 	switch (state->demod_chip) {
 		case NXT2004:
-			if (i2c_writebytes(state, data[0], data+1, 4))
+			if (i2c_writebytes(state, state->config->pll_address, data, 4))
 				printk(KERN_WARNING "nxt200x: error writing to tuner\n");
 			/* wait until we have a lock */
 			while (count < 20) {
-				i2c_readbytes(state, data[0], &buf, 1);
+				i2c_readbytes(state, state->config->pll_address, &buf, 1);
 				if (buf & 0x40)
 					return 0;
 				msleep(100);
@@ -360,10 +361,10 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
 			nxt200x_writebytes(state, 0x34, &buf, 1);
 
 			/* write actual tuner bytes */
-			nxt200x_writebytes(state, 0x36, data+1, 4);
+			nxt200x_writebytes(state, 0x36, data, 4);
 
 			/* set tuner i2c address */
-			buf = data[0] << 1;
+			buf = state->config->pll_address;
 			nxt200x_writebytes(state, 0x35, &buf, 1);
 
 			/* write UC Opmode to begin transfer */
@@ -533,7 +534,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
 					     struct dvb_frontend_parameters *p)
 {
 	struct nxt200x_state* state = fe->demodulator_priv;
-	u8 buf[5];
+	u8 buf[4];
 
 	/* stop the micro first */
 	nxt200x_microcontroller_stop(state);
@@ -547,9 +548,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
 	}
 
 	/* get tuning information */
-	if (fe->ops.tuner_ops.calc_regs) {
-		fe->ops.tuner_ops.calc_regs(fe, p, buf, 5);
-	}
+	dvb_pll_configure(state->config->pll_desc, buf, p->frequency, 0);
 
 	/* set additional params */
 	switch (p->u.vsb.modulation) {
@@ -896,9 +895,9 @@ static int nxt2002_init(struct dvb_frontend* fe)
 	}
 
 	ret = nxt2002_load_firmware(fe, fw);
-	release_firmware(fw);
 	if (ret) {
 		printk("nxt2002: Writing firmware to device failed\n");
+		release_firmware(fw);
 		return ret;
 	}
 	printk("nxt2002: Firmware upload complete\n");
@@ -960,9 +959,9 @@ static int nxt2004_init(struct dvb_frontend* fe)
 	}
 
 	ret = nxt2004_load_firmware(fe, fw);
-	release_firmware(fw);
 	if (ret) {
 		printk("nxt2004: Writing firmware to device failed\n");
+		release_firmware(fw);
 		return ret;
 	}
 	printk("nxt2004: Firmware upload complete\n");
@@ -1160,6 +1159,7 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
 	/* setup the state */
 	state->config = config;
 	state->i2c = i2c;
+	memcpy(&state->ops, &nxt200x_ops, sizeof(struct dvb_frontend_ops));
 	state->initialised = 0;
 
 	/* read card id */
@@ -1198,7 +1198,7 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
 	}
 
 	/* create dvb_frontend */
-	memcpy(&state->frontend.ops, &nxt200x_ops, sizeof(struct dvb_frontend_ops));
+	state->frontend.ops = &state->ops;
 	state->frontend.demodulator_priv = state;
 	return &state->frontend;