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

Commit 6bfc3667 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] s5h1432: 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 80b5b745

drivers/media/dvb/frontends/s5h1432.c

+11 −18
Original line number Diff line number Diff line
@@ -178,9 +178,9 @@ static int s5h1432_set_IF(struct dvb_frontend *fe, u32 ifFreqHz) 
}



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

static int s5h1432_set_frontend(struct dvb_frontend *fe,

				struct dvb_frontend_parameters *p)

static int s5h1432_set_frontend(struct dvb_frontend *fe)

{

	struct dtv_frontend_properties *p = &fe->dtv_property_cache;

	u32 dvb_bandwidth = 8;

	struct s5h1432_state *state = fe->demodulator_priv;
@@ -191,16 +191,16 @@ static int s5h1432_set_frontend(struct dvb_frontend *fe, 
		fe->ops.tuner_ops.set_params(fe);

		msleep(300);

		s5h1432_set_channel_bandwidth(fe, dvb_bandwidth);

		switch (p->u.ofdm.bandwidth) {

		case BANDWIDTH_6_MHZ:

		switch (p->bandwidth_hz) {

		case 6000000:

			dvb_bandwidth = 6;

			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);

			break;

		case BANDWIDTH_7_MHZ:

		case 7000000:

			dvb_bandwidth = 7;

			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);

			break;

		case BANDWIDTH_8_MHZ:

		case 8000000:

			dvb_bandwidth = 8;

			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);

			break;
@@ -215,16 +215,16 @@ static int s5h1432_set_frontend(struct dvb_frontend *fe, 
		s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1b);



		s5h1432_set_channel_bandwidth(fe, dvb_bandwidth);

		switch (p->u.ofdm.bandwidth) {

		case BANDWIDTH_6_MHZ:

		switch (p->bandwidth_hz) {

		case 6000000:

			dvb_bandwidth = 6;

			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);

			break;

		case BANDWIDTH_7_MHZ:

		case 7000000:

			dvb_bandwidth = 7;

			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);

			break;

		case BANDWIDTH_8_MHZ:

		case 8000000:

			dvb_bandwidth = 8;

			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);

			break;
@@ -329,12 +329,6 @@ static int s5h1432_read_ber(struct dvb_frontend *fe, u32 *ber) 
	return 0;

}



static int s5h1432_get_frontend(struct dvb_frontend *fe,

				struct dvb_frontend_parameters *p)

{

	return 0;

}



static int s5h1432_get_tune_settings(struct dvb_frontend *fe,

				     struct dvb_frontend_tune_settings *tune)

{
@@ -396,8 +390,7 @@ static struct dvb_frontend_ops s5h1432_ops = { 


	.init = s5h1432_init,

	.sleep = s5h1432_sleep,

	.set_frontend_legacy = s5h1432_set_frontend,

	.get_frontend_legacy = s5h1432_get_frontend,

	.set_frontend = s5h1432_set_frontend,

	.get_tune_settings = s5h1432_get_tune_settings,

	.read_status = s5h1432_read_status,

	.read_ber = s5h1432_read_ber,