Skip to content

Commit

Permalink
[media] tda8083: convert set_fontend to use DVBv5 parameters
Browse files Browse the repository at this point in the history
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 <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Dec 31, 2011
1 parent 102a820 commit 042e5eb
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions drivers/media/dvb/frontends/tda8083.c
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,9 @@ static int tda8083_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
return 0;
}

static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
static int tda8083_set_frontend(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct tda8083_state* state = fe->demodulator_priv;

if (fe->ops.tuner_ops.set_params) {
Expand All @@ -325,25 +326,25 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
}

tda8083_set_inversion (state, p->inversion);
tda8083_set_fec (state, p->u.qpsk.fec_inner);
tda8083_set_symbolrate (state, p->u.qpsk.symbol_rate);
tda8083_set_fec(state, p->fec_inner);
tda8083_set_symbolrate(state, p->symbol_rate);

tda8083_writereg (state, 0x00, 0x3c);
tda8083_writereg (state, 0x00, 0x04);

return 0;
}

static int tda8083_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
static int tda8083_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *p)
{
struct tda8083_state* state = fe->demodulator_priv;

/* FIXME: get symbolrate & frequency offset...*/
/*p->frequency = ???;*/
p->inversion = (tda8083_readreg (state, 0x0e) & 0x80) ?
INVERSION_ON : INVERSION_OFF;
p->u.qpsk.fec_inner = tda8083_get_fec (state);
/*p->u.qpsk.symbol_rate = tda8083_get_symbolrate (state);*/
p->fec_inner = tda8083_get_fec(state);
/*p->symbol_rate = tda8083_get_symbolrate (state);*/

return 0;
}
Expand Down Expand Up @@ -438,7 +439,7 @@ struct dvb_frontend* tda8083_attach(const struct tda8083_config* config,
}

static struct dvb_frontend_ops tda8083_ops = {

.delsys = { SYS_DVBS },
.info = {
.name = "Philips TDA8083 DVB-S",
.type = FE_QPSK,
Expand All @@ -461,8 +462,8 @@ static struct dvb_frontend_ops tda8083_ops = {
.init = tda8083_init,
.sleep = tda8083_sleep,

.set_frontend_legacy = tda8083_set_frontend,
.get_frontend_legacy = tda8083_get_frontend,
.set_frontend = tda8083_set_frontend,
.get_frontend = tda8083_get_frontend,

.read_status = tda8083_read_status,
.read_signal_strength = tda8083_read_signal_strength,
Expand Down

0 comments on commit 042e5eb

Please sign in to comment.