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

Commit 35aa48e7 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] stv0297: 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 5c6b4e2b

drivers/media/dvb/frontends/stv0297.c

+18 −17
Original line number Diff line number Diff line
@@ -404,8 +404,9 @@ static int stv0297_read_ucblocks(struct dvb_frontend *fe, u32 * ucblocks) 
	return 0;

}



static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)

static int stv0297_set_frontend(struct dvb_frontend *fe)

{

	struct dtv_frontend_properties *p = &fe->dtv_property_cache;

	struct stv0297_state *state = fe->demodulator_priv;

	int u_threshold;

	int initial_u;
@@ -417,7 +418,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par 
	unsigned long timeout;

	fe_spectral_inversion_t inversion;



	switch (p->u.qam.modulation) {

	switch (p->modulation) {

	case QAM_16:

	case QAM_32:

	case QAM_64:
@@ -519,16 +520,16 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par 
	stv0297_writereg_mask(state, 0x69, 0x0f, 0x00);



	/* set parameters */

	stv0297_set_qam(state, p->u.qam.modulation);

	stv0297_set_symbolrate(state, p->u.qam.symbol_rate / 1000);

	stv0297_set_sweeprate(state, sweeprate, p->u.qam.symbol_rate / 1000);

	stv0297_set_qam(state, p->modulation);

	stv0297_set_symbolrate(state, p->symbol_rate / 1000);

	stv0297_set_sweeprate(state, sweeprate, p->symbol_rate / 1000);

	stv0297_set_carrieroffset(state, carrieroffset);

	stv0297_set_inversion(state, inversion);



	/* kick off lock */

	/* Disable corner detection for higher QAMs */

	if (p->u.qam.modulation == QAM_128 ||

		p->u.qam.modulation == QAM_256)

	if (p->modulation == QAM_128 ||

		p->modulation == QAM_256)

		stv0297_writereg_mask(state, 0x88, 0x08, 0x00);

	else

		stv0297_writereg_mask(state, 0x88, 0x08, 0x08);
@@ -613,7 +614,7 @@ timeout: 
	return 0;

}



static int stv0297_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)

static int stv0297_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *p)

{

	struct stv0297_state *state = fe->demodulator_priv;

	int reg_00, reg_83;
@@ -625,24 +626,24 @@ static int stv0297_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par 
	p->inversion = (reg_83 & 0x08) ? INVERSION_ON : INVERSION_OFF;

	if (state->config->invert)

		p->inversion = (p->inversion == INVERSION_ON) ? INVERSION_OFF : INVERSION_ON;

	p->u.qam.symbol_rate = stv0297_get_symbolrate(state) * 1000;

	p->u.qam.fec_inner = FEC_NONE;

	p->symbol_rate = stv0297_get_symbolrate(state) * 1000;

	p->fec_inner = FEC_NONE;



	switch ((reg_00 >> 4) & 0x7) {

	case 0:

		p->u.qam.modulation = QAM_16;

		p->modulation = QAM_16;

		break;

	case 1:

		p->u.qam.modulation = QAM_32;

		p->modulation = QAM_32;

		break;

	case 2:

		p->u.qam.modulation = QAM_128;

		p->modulation = QAM_128;

		break;

	case 3:

		p->u.qam.modulation = QAM_256;

		p->modulation = QAM_256;

		break;

	case 4:

		p->u.qam.modulation = QAM_64;

		p->modulation = QAM_64;

		break;

	}
@@ -706,8 +707,8 @@ static struct dvb_frontend_ops stv0297_ops = { 
	.sleep = stv0297_sleep,

	.i2c_gate_ctrl = stv0297_i2c_gate_ctrl,



	.set_frontend_legacy = stv0297_set_frontend,

	.get_frontend_legacy = stv0297_get_frontend,

	.set_frontend = stv0297_set_frontend,

	.get_frontend = stv0297_get_frontend,



	.read_status = stv0297_read_status,

	.read_ber = stv0297_read_ber,