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

Commit 9f69afbe authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] s5h1420: 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 827b5f3e

drivers/media/dvb/frontends/s5h1420.c

+27 −27
Original line number Original line Diff line number Diff line
@@ -472,15 +472,15 @@ static void s5h1420_reset(struct s5h1420_state* state) 
}

}





static void s5h1420_setsymbolrate(struct s5h1420_state* state,

static void s5h1420_setsymbolrate(struct s5h1420_state* state,

				  struct dvb_frontend_parameters *p)

				  struct dtv_frontend_properties *p)

{

{

	u8 v;

	u8 v;

	u64 val;

	u64 val;





	dprintk("enter %s\n", __func__);

	dprintk("enter %s\n", __func__);





	val = ((u64) p->u.qpsk.symbol_rate / 1000ULL) * (1ULL<<24);

	val = ((u64) p->symbol_rate / 1000ULL) * (1ULL<<24);

	if (p->u.qpsk.symbol_rate < 29000000)

	if (p->symbol_rate < 29000000)

		val *= 2;

		val *= 2;

	do_div(val, (state->fclk / 1000));

	do_div(val, (state->fclk / 1000));
@@ -543,7 +543,7 @@ static int s5h1420_getfreqoffset(struct s5h1420_state* state) 
}

}





static void s5h1420_setfec_inversion(struct s5h1420_state* state,

static void s5h1420_setfec_inversion(struct s5h1420_state* state,

				     struct dvb_frontend_parameters *p)

				     struct dtv_frontend_properties *p)

{

{

	u8 inversion = 0;

	u8 inversion = 0;

	u8 vit08, vit09;

	u8 vit08, vit09;
@@ -555,11 +555,11 @@ static void s5h1420_setfec_inversion(struct s5h1420_state* state, 
	else if (p->inversion == INVERSION_ON)

	else if (p->inversion == INVERSION_ON)

		inversion = state->config->invert ? 0 : 0x08;

		inversion = state->config->invert ? 0 : 0x08;





	if ((p->u.qpsk.fec_inner == FEC_AUTO) || (p->inversion == INVERSION_AUTO)) {

	if ((p->fec_inner == FEC_AUTO) || (p->inversion == INVERSION_AUTO)) {

		vit08 = 0x3f;

		vit08 = 0x3f;

		vit09 = 0;

		vit09 = 0;

	} else {

	} else {

		switch(p->u.qpsk.fec_inner) {

		switch (p->fec_inner) {

		case FEC_1_2:

		case FEC_1_2:

			vit08 = 0x01; vit09 = 0x10;

			vit08 = 0x01; vit09 = 0x10;

			break;

			break;
@@ -628,9 +628,9 @@ static fe_spectral_inversion_t s5h1420_getinversion(struct s5h1420_state* state) 
	return INVERSION_OFF;

	return INVERSION_OFF;

}

}





static int s5h1420_set_frontend(struct dvb_frontend* fe,

static int s5h1420_set_frontend(struct dvb_frontend *fe)

				struct dvb_frontend_parameters *p)

{

{

	struct dtv_frontend_properties *p = &fe->dtv_property_cache;

	struct s5h1420_state* state = fe->demodulator_priv;

	struct s5h1420_state* state = fe->demodulator_priv;

	int frequency_delta;

	int frequency_delta;

	struct dvb_frontend_tune_settings fesettings;

	struct dvb_frontend_tune_settings fesettings;
@@ -639,14 +639,14 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, 
	dprintk("enter %s\n", __func__);

	dprintk("enter %s\n", __func__);





	/* check if we should do a fast-tune */

	/* check if we should do a fast-tune */

	memcpy(&fesettings.parameters, p, sizeof(struct dvb_frontend_parameters));

	memcpy(&fesettings.parameters, p, sizeof(struct dtv_frontend_properties));

	s5h1420_get_tune_settings(fe, &fesettings);

	s5h1420_get_tune_settings(fe, &fesettings);

	frequency_delta = p->frequency - state->tunedfreq;

	frequency_delta = p->frequency - state->tunedfreq;

	if ((frequency_delta > -fesettings.max_drift) &&

	if ((frequency_delta > -fesettings.max_drift) &&

			(frequency_delta < fesettings.max_drift) &&

			(frequency_delta < fesettings.max_drift) &&

			(frequency_delta != 0) &&

			(frequency_delta != 0) &&

			(state->fec_inner == p->u.qpsk.fec_inner) &&

			(state->fec_inner == p->fec_inner) &&

			(state->symbol_rate == p->u.qpsk.symbol_rate)) {

			(state->symbol_rate == p->symbol_rate)) {





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

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

			fe->ops.tuner_ops.set_params(fe);

			fe->ops.tuner_ops.set_params(fe);
@@ -669,13 +669,13 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, 
	s5h1420_reset(state);

	s5h1420_reset(state);





	/* set s5h1420 fclk PLL according to desired symbol rate */

	/* set s5h1420 fclk PLL according to desired symbol rate */

	if (p->u.qpsk.symbol_rate > 33000000)

	if (p->symbol_rate > 33000000)

		state->fclk = 80000000;

		state->fclk = 80000000;

	else if (p->u.qpsk.symbol_rate > 28500000)

	else if (p->symbol_rate > 28500000)

		state->fclk = 59000000;

		state->fclk = 59000000;

	else if (p->u.qpsk.symbol_rate > 25000000)

	else if (p->symbol_rate > 25000000)

		state->fclk = 86000000;

		state->fclk = 86000000;

	else if (p->u.qpsk.symbol_rate > 1900000)

	else if (p->symbol_rate > 1900000)

		state->fclk = 88000000;

		state->fclk = 88000000;

	else

	else

		state->fclk = 44000000;

		state->fclk = 44000000;
@@ -705,7 +705,7 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, 
	s5h1420_writereg(state, DiS01, (state->fclk + (TONE_FREQ * 32) - 1) / (TONE_FREQ * 32));

	s5h1420_writereg(state, DiS01, (state->fclk + (TONE_FREQ * 32) - 1) / (TONE_FREQ * 32));





	/* TODO DC offset removal, config parameter ? */

	/* TODO DC offset removal, config parameter ? */

	if (p->u.qpsk.symbol_rate > 29000000)

	if (p->symbol_rate > 29000000)

		s5h1420_writereg(state, QPSK01, 0xae | 0x10);

		s5h1420_writereg(state, QPSK01, 0xae | 0x10);

	else

	else

		s5h1420_writereg(state, QPSK01, 0xac | 0x10);

		s5h1420_writereg(state, QPSK01, 0xac | 0x10);
@@ -718,15 +718,15 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, 
	s5h1420_writereg(state, Loop01, 0xF0);

	s5h1420_writereg(state, Loop01, 0xF0);

	s5h1420_writereg(state, Loop02, 0x2a); /* e7 for s5h1420 */

	s5h1420_writereg(state, Loop02, 0x2a); /* e7 for s5h1420 */

	s5h1420_writereg(state, Loop03, 0x79); /* 78 for s5h1420 */

	s5h1420_writereg(state, Loop03, 0x79); /* 78 for s5h1420 */

	if (p->u.qpsk.symbol_rate > 20000000)

	if (p->symbol_rate > 20000000)

		s5h1420_writereg(state, Loop04, 0x79);

		s5h1420_writereg(state, Loop04, 0x79);

	else

	else

		s5h1420_writereg(state, Loop04, 0x58);

		s5h1420_writereg(state, Loop04, 0x58);

	s5h1420_writereg(state, Loop05, 0x6b);

	s5h1420_writereg(state, Loop05, 0x6b);





	if (p->u.qpsk.symbol_rate >= 8000000)

	if (p->symbol_rate >= 8000000)

		s5h1420_writereg(state, Post01, (0 << 6) | 0x10);

		s5h1420_writereg(state, Post01, (0 << 6) | 0x10);

	else if (p->u.qpsk.symbol_rate >= 4000000)

	else if (p->symbol_rate >= 4000000)

		s5h1420_writereg(state, Post01, (1 << 6) | 0x10);

		s5h1420_writereg(state, Post01, (1 << 6) | 0x10);

	else

	else

		s5h1420_writereg(state, Post01, (3 << 6) | 0x10);

		s5h1420_writereg(state, Post01, (3 << 6) | 0x10);
@@ -757,8 +757,8 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, 
	/* start QPSK */

	/* start QPSK */

	s5h1420_writereg(state, QPSK01, s5h1420_readreg(state, QPSK01) | 1);

	s5h1420_writereg(state, QPSK01, s5h1420_readreg(state, QPSK01) | 1);





	state->fec_inner = p->u.qpsk.fec_inner;

	state->fec_inner = p->fec_inner;

	state->symbol_rate = p->u.qpsk.symbol_rate;

	state->symbol_rate = p->symbol_rate;

	state->postlocked = 0;

	state->postlocked = 0;

	state->tunedfreq = p->frequency;

	state->tunedfreq = p->frequency;
@@ -767,14 +767,14 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, 
}

}





static int s5h1420_get_frontend(struct dvb_frontend* fe,

static int s5h1420_get_frontend(struct dvb_frontend* fe,

				struct dvb_frontend_parameters *p)

				struct dtv_frontend_properties *p)

{

{

	struct s5h1420_state* state = fe->demodulator_priv;

	struct s5h1420_state* state = fe->demodulator_priv;





	p->frequency = state->tunedfreq + s5h1420_getfreqoffset(state);

	p->frequency = state->tunedfreq + s5h1420_getfreqoffset(state);

	p->inversion = s5h1420_getinversion(state);

	p->inversion = s5h1420_getinversion(state);

	p->u.qpsk.symbol_rate = s5h1420_getsymbolrate(state);

	p->symbol_rate = s5h1420_getsymbolrate(state);

	p->u.qpsk.fec_inner = s5h1420_getfec(state);

	p->fec_inner = s5h1420_getfec(state);





	return 0;

	return 0;

}

}
@@ -937,7 +937,7 @@ struct dvb_frontend *s5h1420_attach(const struct s5h1420_config *config, 
EXPORT_SYMBOL(s5h1420_attach);

EXPORT_SYMBOL(s5h1420_attach);





static struct dvb_frontend_ops s5h1420_ops = {

static struct dvb_frontend_ops s5h1420_ops = {



	.delsys = { SYS_DVBS },

	.info = {

	.info = {

		.name     = "Samsung S5H1420/PnpNetwork PN1010 DVB-S",

		.name     = "Samsung S5H1420/PnpNetwork PN1010 DVB-S",

		.type     = FE_QPSK,

		.type     = FE_QPSK,
@@ -960,8 +960,8 @@ static struct dvb_frontend_ops s5h1420_ops = { 
	.sleep = s5h1420_sleep,

	.sleep = s5h1420_sleep,

	.i2c_gate_ctrl = s5h1420_i2c_gate_ctrl,

	.i2c_gate_ctrl = s5h1420_i2c_gate_ctrl,





	.set_frontend_legacy = s5h1420_set_frontend,

	.set_frontend = s5h1420_set_frontend,

	.get_frontend_legacy = s5h1420_get_frontend,

	.get_frontend = s5h1420_get_frontend,

	.get_tune_settings = s5h1420_get_tune_settings,

	.get_tune_settings = s5h1420_get_tune_settings,





	.read_status = s5h1420_read_status,

	.read_status = s5h1420_read_status,