diff options
| author | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-04-18 21:47:11 +0100 |
|---|---|---|
| committer | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-04-18 21:47:11 +0100 |
| commit | b6c785b318edd67bd77b5c8d3748f827a7935f60 (patch) | |
| tree | 4e95457a76abb2ebd5cd1a01048be37c72e93319 | |
| parent | ffb483d0d47968d903cfe9027501b43d63a88ddb (diff) | |
| download | mediapointer-dvb-s2-b6c785b318edd67bd77b5c8d3748f827a7935f60.tar.gz mediapointer-dvb-s2-b6c785b318edd67bd77b5c8d3748f827a7935f60.tar.bz2 | |
Convert zl10353 to refactored tuner code
From: Andrew de Quincey <adq_dvb@lidskialf.net>
Convert to tuner_ops calls.
Remove pll function pointers from structure.
Use standardised pllbuf call.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
| -rw-r--r-- | linux/drivers/media/dvb/frontends/zl10353.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/zl10353.h | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/linux/drivers/media/dvb/frontends/zl10353.c b/linux/drivers/media/dvb/frontends/zl10353.c index 10bb871fa..c81b8902c 100644 --- a/linux/drivers/media/dvb/frontends/zl10353.c +++ b/linux/drivers/media/dvb/frontends/zl10353.c @@ -129,7 +129,6 @@ static int zl10353_sleep(struct dvb_frontend *fe) static int zl10353_set_parameters(struct dvb_frontend *fe, struct dvb_frontend_parameters *param) { - struct zl10353_state *state = fe->demodulator_priv; u8 pllbuf[6] = { 0x67 }; /* These settings set "auto-everything" and start the FSM. */ @@ -146,8 +145,11 @@ static int zl10353_set_parameters(struct dvb_frontend *fe, zl10353_single_write(fe, 0x66, 0xE9); zl10353_single_write(fe, 0x62, 0x0A); - state->config.pll_set(fe, param, pllbuf + 1); - zl10353_write(fe, pllbuf, sizeof(pllbuf)); + if (fe->ops->tuner_ops.pllbuf) { + fe->ops->tuner_ops.pllbuf(fe, param, pllbuf+1, 5); + pllbuf[1] <<= 1; + zl10353_write(fe, pllbuf, sizeof(pllbuf)); + } zl10353_single_write(fe, 0x70, 0x01); udelay(250); diff --git a/linux/drivers/media/dvb/frontends/zl10353.h b/linux/drivers/media/dvb/frontends/zl10353.h index 5cc4ae718..63c36ec02 100644 --- a/linux/drivers/media/dvb/frontends/zl10353.h +++ b/linux/drivers/media/dvb/frontends/zl10353.h @@ -28,11 +28,6 @@ struct zl10353_config { /* demodulator's I2C address */ u8 demod_address; - - /* function which configures the PLL buffer (for secondary I2C - * connected tuner) or tunes the PLL (for direct connected tuner) */ - int (*pll_set)(struct dvb_frontend *fe, - struct dvb_frontend_parameters *params, u8 *pllbuf); }; extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config, |