hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (3847): Convert cx22700 to refactored tuner code 

Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c 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:
Andrew de Quincey 2006-04-18 17:47:09 -03:00 committed by Mauro Carvalho Chehab
parent 7eef5dd6da
commit 5becb3b045
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/media/dvb/frontends/cx22700.c
View File

@ -247,12 +247,6 @@ static int cx22700_init (struct dvb_frontend* fe)
cx22700_writereg (state, 0x00, 0x01); cx22700_writereg (state, 0x00, 0x01);
if (state->config->pll_init) {
cx22700_writereg (state, 0x0a, 0x00); /* open i2c bus switch */
state->config->pll_init(fe);
cx22700_writereg (state, 0x0a, 0x01); /* close i2c bus switch */
}
return 0; return 0;
} }
@ -333,9 +327,11 @@ static int cx22700_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
cx22700_writereg (state, 0x00, 0x02); /* XXX CHECKME: soft reset*/ cx22700_writereg (state, 0x00, 0x02); /* XXX CHECKME: soft reset*/
cx22700_writereg (state, 0x00, 0x00); cx22700_writereg (state, 0x00, 0x00);
cx22700_writereg (state, 0x0a, 0x00); /* open i2c bus switch */ if (fe->ops->tuner_ops.set_params) {
state->config->pll_set(fe, p); fe->ops->tuner_ops.set_params(fe, p);
cx22700_writereg (state, 0x0a, 0x01); /* close i2c bus switch */ if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
}
cx22700_set_inversion (state, p->inversion); cx22700_set_inversion (state, p->inversion);
cx22700_set_tps (state, &p->u.ofdm); cx22700_set_tps (state, &p->u.ofdm);
cx22700_writereg (state, 0x37, 0x01); /* PAL loop filter off */ cx22700_writereg (state, 0x37, 0x01); /* PAL loop filter off */
@ -353,6 +349,17 @@ static int cx22700_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
return cx22700_get_tps (state, &p->u.ofdm); return cx22700_get_tps (state, &p->u.ofdm);
} }
static int cx22700_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
{
struct cx22700_state* state = fe->demodulator_priv;
if (enable) {
return cx22700_writereg(state, 0x0a, 0x00);
} else {
return cx22700_writereg(state, 0x0a, 0x01);
}
}
static int cx22700_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings) static int cx22700_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
{ {
fesettings->min_delay_ms = 150; fesettings->min_delay_ms = 150;
@ -413,6 +420,7 @@ static struct dvb_frontend_ops cx22700_ops = {
.release = cx22700_release, .release = cx22700_release,
.init = cx22700_init, .init = cx22700_init,
.i2c_gate_ctrl = cx22700_i2c_gate_ctrl,
.set_frontend = cx22700_set_frontend, .set_frontend = cx22700_set_frontend,
.get_frontend = cx22700_get_frontend, .get_frontend = cx22700_get_frontend,

4
drivers/media/dvb/frontends/cx22700.h
View File

@ -29,10 +29,6 @@ struct cx22700_config
{ {
/* the demodulator's i2c address */ /* the demodulator's i2c address */
u8 demod_address; u8 demod_address;
/* 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* cx22700_attach(const struct cx22700_config* config, extern struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,