From 7826bcd58427878654d42e84f795e7f7d42ed1f1 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 26 Dec 2011 14:42:48 -0300 Subject: [PATCH] [media] tda10021: convert set_fontend to use DVBv5 parameters Instead of using dvb_frontend_parameters struct, that were designed for a subset of the supported standards, use the DVBv5 cache information. Also, fill the supported delivery systems at dvb_frontend_ops struct. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb/frontends/tda10021.c | 37 +++++++------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c index 3976d2235dbd..051c6bf9b68b 100644 --- a/drivers/media/dvb/frontends/tda10021.c +++ b/drivers/media/dvb/frontends/tda10021.c @@ -228,8 +228,7 @@ struct qam_params { u8 conf, agcref, lthr, mseth, aref; }; -static int tda10021_set_parameters (struct dvb_frontend *fe, - struct dvb_frontend_parameters *p) +static int tda10021_set_parameters(struct dvb_frontend *fe) { struct dtv_frontend_properties *c = &fe->dtv_property_cache; u32 delsys = c->delivery_system; @@ -280,7 +279,7 @@ static int tda10021_set_parameters (struct dvb_frontend *fe, if (c->inversion != INVERSION_ON && c->inversion != INVERSION_OFF) return -EINVAL; - //printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p->frequency,qam,p->u.qam.symbol_rate); + /*printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p->frequency,qam,p->symbol_rate);*/ if (fe->ops.tuner_ops.set_params) { fe->ops.tuner_ops.set_params(fe); @@ -387,7 +386,7 @@ static int tda10021_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) return 0; } -static int tda10021_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p) +static int tda10021_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *p) { struct tda10021_state* state = fe->demodulator_priv; int sync; @@ -400,17 +399,17 @@ static int tda10021_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa printk(sync & 2 ? "DVB: TDA10021(%d): AFC (%d) %dHz\n" : "DVB: TDA10021(%d): [AFC (%d) %dHz]\n", state->frontend.dvb->num, afc, - -((s32)p->u.qam.symbol_rate * afc) >> 10); + -((s32)p->symbol_rate * afc) >> 10); } p->inversion = ((state->reg0 & 0x20) == 0x20) ^ (state->config->invert != 0) ? INVERSION_ON : INVERSION_OFF; - p->u.qam.modulation = ((state->reg0 >> 2) & 7) + QAM_16; + p->modulation = ((state->reg0 >> 2) & 7) + QAM_16; - p->u.qam.fec_inner = FEC_NONE; + p->fec_inner = FEC_NONE; p->frequency = ((p->frequency + 31250) / 62500) * 62500; if (sync & 2) - p->frequency -= ((s32)p->u.qam.symbol_rate * afc) >> 10; + p->frequency -= ((s32)p->symbol_rate * afc) >> 10; return 0; } @@ -483,23 +482,8 @@ error: return NULL; } -static int tda10021_get_property(struct dvb_frontend *fe, - struct dtv_property *p) -{ - switch (p->cmd) { - case DTV_ENUM_DELSYS: - p->u.buffer.data[0] = SYS_DVBC_ANNEX_A; - p->u.buffer.data[1] = SYS_DVBC_ANNEX_C; - p->u.buffer.len = 2; - break; - default: - break; - } - return 0; -} - static struct dvb_frontend_ops tda10021_ops = { - + .delsys = { SYS_DVBC_ANNEX_A, SYS_DVBC_ANNEX_C }, .info = { .name = "Philips TDA10021 DVB-C", .type = FE_QAM, @@ -524,9 +508,8 @@ static struct dvb_frontend_ops tda10021_ops = { .sleep = tda10021_sleep, .i2c_gate_ctrl = tda10021_i2c_gate_ctrl, - .set_frontend_legacy = tda10021_set_parameters, - .get_frontend_legacy = tda10021_get_frontend, - .get_property = tda10021_get_property, + .set_frontend = tda10021_set_parameters, + .get_frontend = tda10021_get_frontend, .read_status = tda10021_read_status, .read_ber = tda10021_read_ber, -- 2.20.1