Commit 102a820d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] s55h1411: 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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fd129844
...@@ -585,9 +585,9 @@ static int s5h1411_register_reset(struct dvb_frontend *fe) ...@@ -585,9 +585,9 @@ static int s5h1411_register_reset(struct dvb_frontend *fe)
} }
/* Talk to the demod, set the FEC, GUARD, QAM settings etc */ /* Talk to the demod, set the FEC, GUARD, QAM settings etc */
static int s5h1411_set_frontend(struct dvb_frontend *fe, static int s5h1411_set_frontend(struct dvb_frontend *fe)
struct dvb_frontend_parameters *p)
{ {
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct s5h1411_state *state = fe->demodulator_priv; struct s5h1411_state *state = fe->demodulator_priv;
dprintk("%s(frequency=%d)\n", __func__, p->frequency); dprintk("%s(frequency=%d)\n", __func__, p->frequency);
...@@ -596,7 +596,7 @@ static int s5h1411_set_frontend(struct dvb_frontend *fe, ...@@ -596,7 +596,7 @@ static int s5h1411_set_frontend(struct dvb_frontend *fe,
state->current_frequency = p->frequency; state->current_frequency = p->frequency;
s5h1411_enable_modulation(fe, p->u.vsb.modulation); s5h1411_enable_modulation(fe, p->modulation);
if (fe->ops.tuner_ops.set_params) { if (fe->ops.tuner_ops.set_params) {
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
...@@ -841,12 +841,12 @@ static int s5h1411_read_ber(struct dvb_frontend *fe, u32 *ber) ...@@ -841,12 +841,12 @@ static int s5h1411_read_ber(struct dvb_frontend *fe, u32 *ber)
} }
static int s5h1411_get_frontend(struct dvb_frontend *fe, static int s5h1411_get_frontend(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p) struct dtv_frontend_properties *p)
{ {
struct s5h1411_state *state = fe->demodulator_priv; struct s5h1411_state *state = fe->demodulator_priv;
p->frequency = state->current_frequency; p->frequency = state->current_frequency;
p->u.vsb.modulation = state->current_modulation; p->modulation = state->current_modulation;
return 0; return 0;
} }
...@@ -915,7 +915,7 @@ struct dvb_frontend *s5h1411_attach(const struct s5h1411_config *config, ...@@ -915,7 +915,7 @@ struct dvb_frontend *s5h1411_attach(const struct s5h1411_config *config,
EXPORT_SYMBOL(s5h1411_attach); EXPORT_SYMBOL(s5h1411_attach);
static struct dvb_frontend_ops s5h1411_ops = { static struct dvb_frontend_ops s5h1411_ops = {
.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
.info = { .info = {
.name = "Samsung S5H1411 QAM/8VSB Frontend", .name = "Samsung S5H1411 QAM/8VSB Frontend",
.type = FE_ATSC, .type = FE_ATSC,
...@@ -928,8 +928,8 @@ static struct dvb_frontend_ops s5h1411_ops = { ...@@ -928,8 +928,8 @@ static struct dvb_frontend_ops s5h1411_ops = {
.init = s5h1411_init, .init = s5h1411_init,
.sleep = s5h1411_sleep, .sleep = s5h1411_sleep,
.i2c_gate_ctrl = s5h1411_i2c_gate_ctrl, .i2c_gate_ctrl = s5h1411_i2c_gate_ctrl,
.set_frontend_legacy = s5h1411_set_frontend, .set_frontend = s5h1411_set_frontend,
.get_frontend_legacy = s5h1411_get_frontend, .get_frontend = s5h1411_get_frontend,
.get_tune_settings = s5h1411_get_tune_settings, .get_tune_settings = s5h1411_get_tune_settings,
.read_status = s5h1411_read_status, .read_status = s5h1411_read_status,
.read_ber = s5h1411_read_ber, .read_ber = s5h1411_read_ber,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment