Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd129844 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] s5h1409: 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 d42c0869

drivers/media/dvb/frontends/s5h1409.c

+8 −8
Original line number Diff line number Diff line
@@ -631,9 +631,9 @@ static void s5h1409_set_qam_interleave_mode_legacy(struct dvb_frontend *fe) 
}



/* Talk to the demod, set the FEC, GUARD, QAM settings etc */

static int s5h1409_set_frontend(struct dvb_frontend *fe,

				 struct dvb_frontend_parameters *p)

static int s5h1409_set_frontend(struct dvb_frontend *fe)

{

	struct dtv_frontend_properties *p = &fe->dtv_property_cache;

	struct s5h1409_state *state = fe->demodulator_priv;



	dprintk("%s(frequency=%d)\n", __func__, p->frequency);
@@ -642,7 +642,7 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe, 


	state->current_frequency = p->frequency;



	s5h1409_enable_modulation(fe, p->u.vsb.modulation);

	s5h1409_enable_modulation(fe, p->modulation);



	if (fe->ops.tuner_ops.set_params) {

		if (fe->ops.i2c_gate_ctrl)
@@ -926,12 +926,12 @@ static int s5h1409_read_ber(struct dvb_frontend *fe, u32 *ber) 
}



static int s5h1409_get_frontend(struct dvb_frontend *fe,

				struct dvb_frontend_parameters *p)

				struct dtv_frontend_properties *p)

{

	struct s5h1409_state *state = fe->demodulator_priv;



	p->frequency = state->current_frequency;

	p->u.vsb.modulation = state->current_modulation;

	p->modulation = state->current_modulation;



	return 0;

}
@@ -996,7 +996,7 @@ struct dvb_frontend *s5h1409_attach(const struct s5h1409_config *config, 
EXPORT_SYMBOL(s5h1409_attach);



static struct dvb_frontend_ops s5h1409_ops = {



	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },

	.info = {

		.name			= "Samsung S5H1409 QAM/8VSB Frontend",

		.type			= FE_ATSC,
@@ -1008,8 +1008,8 @@ static struct dvb_frontend_ops s5h1409_ops = { 


	.init                 = s5h1409_init,

	.i2c_gate_ctrl        = s5h1409_i2c_gate_ctrl,

	.set_frontend_legacy         = s5h1409_set_frontend,

	.get_frontend_legacy = s5h1409_get_frontend,

	.set_frontend         = s5h1409_set_frontend,

	.get_frontend         = s5h1409_get_frontend,

	.get_tune_settings    = s5h1409_get_tune_settings,

	.read_status          = s5h1409_read_status,

	.read_ber             = s5h1409_read_ber,