Skip to content

Commit

Permalink
[media] tda10086: 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 b2a29b5 commit 6714049
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions drivers/media/dvb/frontends/tda10086.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static int tda10086_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minic
}

static int tda10086_set_inversion(struct tda10086_state *state,
struct dvb_frontend_parameters *fe_params)
struct dtv_frontend_properties *fe_params)
{
u8 invval = 0x80;

Expand All @@ -292,7 +292,7 @@ static int tda10086_set_inversion(struct tda10086_state *state,
}

static int tda10086_set_symbol_rate(struct tda10086_state *state,
struct dvb_frontend_parameters *fe_params)
struct dtv_frontend_properties *fe_params)
{
u8 dfn = 0;
u8 afs = 0;
Expand All @@ -303,7 +303,7 @@ static int tda10086_set_symbol_rate(struct tda10086_state *state,
u32 tmp;
u32 bdr;
u32 bdri;
u32 symbol_rate = fe_params->u.qpsk.symbol_rate;
u32 symbol_rate = fe_params->symbol_rate;

dprintk ("%s %i\n", __func__, symbol_rate);

Expand Down Expand Up @@ -367,13 +367,13 @@ static int tda10086_set_symbol_rate(struct tda10086_state *state,
}

static int tda10086_set_fec(struct tda10086_state *state,
struct dvb_frontend_parameters *fe_params)
struct dtv_frontend_properties *fe_params)
{
u8 fecval;

dprintk ("%s %i\n", __func__, fe_params->u.qpsk.fec_inner);
dprintk("%s %i\n", __func__, fe_params->fec_inner);

switch(fe_params->u.qpsk.fec_inner) {
switch (fe_params->fec_inner) {
case FEC_1_2:
fecval = 0x00;
break;
Expand Down Expand Up @@ -409,9 +409,9 @@ static int tda10086_set_fec(struct tda10086_state *state,
return 0;
}

static int tda10086_set_frontend(struct dvb_frontend* fe,
struct dvb_frontend_parameters *fe_params)
static int tda10086_set_frontend(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache;
struct tda10086_state *state = fe->demodulator_priv;
int ret;
u32 freq = 0;
Expand Down Expand Up @@ -452,12 +452,12 @@ static int tda10086_set_frontend(struct dvb_frontend* fe,
tda10086_write_mask(state, 0x10, 0x40, 0x40);
tda10086_write_mask(state, 0x00, 0x01, 0x00);

state->symbol_rate = fe_params->u.qpsk.symbol_rate;
state->symbol_rate = fe_params->symbol_rate;
state->frequency = fe_params->frequency;
return 0;
}

static int tda10086_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *fe_params)
static int tda10086_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *fe_params)
{
struct tda10086_state* state = fe->demodulator_priv;
u8 val;
Expand All @@ -467,7 +467,7 @@ static int tda10086_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa
dprintk ("%s\n", __func__);

/* check for invalid symbol rate */
if (fe_params->u.qpsk.symbol_rate < 500000)
if (fe_params->symbol_rate < 500000)
return -EINVAL;

/* calculate the updated frequency (note: we convert from Hz->kHz) */
Expand Down Expand Up @@ -516,34 +516,34 @@ static int tda10086_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa
tmp |= 0xffffff00;
tmp = (tmp * 480 * (1<<1)) / 128;
tmp = ((state->symbol_rate/1000) * tmp) / (1000000/1000);
fe_params->u.qpsk.symbol_rate = state->symbol_rate + tmp;
fe_params->symbol_rate = state->symbol_rate + tmp;

/* the FEC */
val = (tda10086_read_byte(state, 0x0d) & 0x70) >> 4;
switch(val) {
case 0x00:
fe_params->u.qpsk.fec_inner = FEC_1_2;
fe_params->fec_inner = FEC_1_2;
break;
case 0x01:
fe_params->u.qpsk.fec_inner = FEC_2_3;
fe_params->fec_inner = FEC_2_3;
break;
case 0x02:
fe_params->u.qpsk.fec_inner = FEC_3_4;
fe_params->fec_inner = FEC_3_4;
break;
case 0x03:
fe_params->u.qpsk.fec_inner = FEC_4_5;
fe_params->fec_inner = FEC_4_5;
break;
case 0x04:
fe_params->u.qpsk.fec_inner = FEC_5_6;
fe_params->fec_inner = FEC_5_6;
break;
case 0x05:
fe_params->u.qpsk.fec_inner = FEC_6_7;
fe_params->fec_inner = FEC_6_7;
break;
case 0x06:
fe_params->u.qpsk.fec_inner = FEC_7_8;
fe_params->fec_inner = FEC_7_8;
break;
case 0x07:
fe_params->u.qpsk.fec_inner = FEC_8_9;
fe_params->fec_inner = FEC_8_9;
break;
}

Expand Down Expand Up @@ -701,7 +701,7 @@ static void tda10086_release(struct dvb_frontend* fe)
}

static struct dvb_frontend_ops tda10086_ops = {

.delsys = { SYS_DVBS },
.info = {
.name = "Philips TDA10086 DVB-S",
.type = FE_QPSK,
Expand All @@ -722,8 +722,8 @@ static struct dvb_frontend_ops tda10086_ops = {
.sleep = tda10086_sleep,
.i2c_gate_ctrl = tda10086_i2c_gate_ctrl,

.set_frontend_legacy = tda10086_set_frontend,
.get_frontend_legacy = tda10086_get_frontend,
.set_frontend = tda10086_set_frontend,
.get_frontend = tda10086_get_frontend,
.get_tune_settings = tda10086_get_tune_settings,

.read_status = tda10086_read_status,
Expand Down

0 comments on commit 6714049

Please sign in to comment.