Skip to content

Commit

Permalink
[media] stv900: 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 45f4a8e commit 38d945e
Showing 1 changed file with 4 additions and 31 deletions.
35 changes: 4 additions & 31 deletions drivers/media/dvb/frontends/stv0900_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -973,31 +973,6 @@ static enum dvbfe_algo stv0900_frontend_algo(struct dvb_frontend *fe)
return DVBFE_ALGO_CUSTOM;
}

static int stb0900_set_property(struct dvb_frontend *fe,
struct dtv_property *tvp)
{
dprintk("%s(..)\n", __func__);

return 0;
}

static int stb0900_get_property(struct dvb_frontend *fe,
struct dtv_property *tvp)
{
dprintk("%s(..)\n", __func__);
switch (tvp->cmd) {
case DTV_ENUM_DELSYS:
tvp->u.buffer.data[0] = SYS_DSS;
tvp->u.buffer.data[1] = SYS_DVBS;
tvp->u.buffer.data[2] = SYS_DVBS2;
tvp->u.buffer.len = 3;
break;
default:
break;
}
return 0;
}

void stv0900_start_search(struct stv0900_internal *intp,
enum fe_stv0900_demod_num demod)
{
Expand Down Expand Up @@ -1876,20 +1851,20 @@ static int stv0900_sleep(struct dvb_frontend *fe)
}

static int stv0900_get_frontend(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
struct dtv_frontend_properties *p)
{
struct stv0900_state *state = fe->demodulator_priv;
struct stv0900_internal *intp = state->internal;
enum fe_stv0900_demod_num demod = state->demod;
struct stv0900_signal_info p_result = intp->result[demod];

p->frequency = p_result.locked ? p_result.frequency : 0;
p->u.qpsk.symbol_rate = p_result.locked ? p_result.symbol_rate : 0;
p->symbol_rate = p_result.locked ? p_result.symbol_rate : 0;
return 0;
}

static struct dvb_frontend_ops stv0900_ops = {

.delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },
.info = {
.name = "STV0900 frontend",
.type = FE_QPSK,
Expand All @@ -1908,16 +1883,14 @@ static struct dvb_frontend_ops stv0900_ops = {
},
.release = stv0900_release,
.init = stv0900_init,
.get_frontend_legacy = stv0900_get_frontend,
.get_frontend = stv0900_get_frontend,
.sleep = stv0900_sleep,
.get_frontend_algo = stv0900_frontend_algo,
.i2c_gate_ctrl = stv0900_i2c_gate_ctrl,
.diseqc_send_master_cmd = stv0900_send_master_cmd,
.diseqc_send_burst = stv0900_send_burst,
.diseqc_recv_slave_reply = stv0900_recv_slave_reply,
.set_tone = stv0900_set_tone,
.set_property = stb0900_set_property,
.get_property = stb0900_get_property,
.search = stv0900_search,
.track = stv0900_track,
.read_status = stv0900_read_status,
Expand Down

0 comments on commit 38d945e

Please sign in to comment.