V4L/DVB (3850): Convert stv0297 to refactored tuner code
Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Remove extra exported pll gate control function. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
a81870e00b
commit
58ac7d3617
|
@ -276,12 +276,14 @@ static int stv0297_set_inversion(struct stv0297_state *state, fe_spectral_invers
|
|||
return 0;
|
||||
}
|
||||
|
||||
int stv0297_enable_plli2c(struct dvb_frontend *fe)
|
||||
static int stv0297_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
|
||||
{
|
||||
struct stv0297_state *state = fe->demodulator_priv;
|
||||
|
||||
stv0297_writereg(state, 0x87, 0x78);
|
||||
stv0297_writereg(state, 0x86, 0xc8);
|
||||
if (enable) {
|
||||
stv0297_writereg(state, 0x87, 0x78);
|
||||
stv0297_writereg(state, 0x86, 0xc8);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -296,9 +298,6 @@ static int stv0297_init(struct dvb_frontend *fe)
|
|||
stv0297_writereg(state, state->config->inittab[i], state->config->inittab[i+1]);
|
||||
msleep(200);
|
||||
|
||||
if (state->config->pll_init)
|
||||
state->config->pll_init(fe);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -421,7 +420,10 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
|
|||
}
|
||||
|
||||
stv0297_init(fe);
|
||||
state->config->pll_set(fe, p);
|
||||
if (fe->ops->tuner_ops.set_params) {
|
||||
fe->ops->tuner_ops.set_params(fe, p);
|
||||
if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
|
||||
}
|
||||
|
||||
/* clear software interrupts */
|
||||
stv0297_writereg(state, 0x82, 0x0);
|
||||
|
@ -668,6 +670,7 @@ static struct dvb_frontend_ops stv0297_ops = {
|
|||
|
||||
.init = stv0297_init,
|
||||
.sleep = stv0297_sleep,
|
||||
.i2c_gate_ctrl = stv0297_i2c_gate_ctrl,
|
||||
|
||||
.set_frontend = stv0297_set_frontend,
|
||||
.get_frontend = stv0297_get_frontend,
|
||||
|
@ -684,4 +687,3 @@ MODULE_AUTHOR("Dennis Noermann and Andrew de Quincey");
|
|||
MODULE_LICENSE("GPL");
|
||||
|
||||
EXPORT_SYMBOL(stv0297_attach);
|
||||
EXPORT_SYMBOL(stv0297_enable_plli2c);
|
||||
|
|
|
@ -37,14 +37,9 @@ struct stv0297_config
|
|||
|
||||
/* does the "inversion" need inverted? */
|
||||
u8 invert:1;
|
||||
|
||||
/* PLL maintenance */
|
||||
int (*pll_init)(struct dvb_frontend* fe);
|
||||
int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
|
||||
};
|
||||
|
||||
extern struct dvb_frontend* stv0297_attach(const struct stv0297_config* config,
|
||||
struct i2c_adapter* i2c);
|
||||
extern int stv0297_enable_plli2c(struct dvb_frontend* fe);
|
||||
|
||||
#endif // STV0297_H
|
||||
|
|
Loading…
Reference in a new issue