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

Commit 93ce675c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] mxl111sf-tuner: use DVBv5 parameters on set_params() 



Instead of using DVBv3 parameters, rely on DVBv5 parameters to
set the tuner

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 66e6cd59

drivers/media/dvb/dvb-usb/mxl111sf-tuner.c

+22 −24
Original line number Diff line number Diff line
@@ -275,52 +275,50 @@ static int mxl1x1sf_tuner_loop_thru_ctrl(struct mxl111sf_tuner_state *state, 
static int mxl111sf_tuner_set_params(struct dvb_frontend *fe,

				     struct dvb_frontend_parameters *params)

{

	struct dtv_frontend_properties *c = &fe->dtv_property_cache;

	u32 delsys  = c->delivery_system;

	struct mxl111sf_tuner_state *state = fe->tuner_priv;

	int ret;

	u8 bw;

	u32 band = BANDWIDTH_6_MHZ;



	mxl_dbg("()");



	if (fe->ops.info.type == FE_ATSC) {

		switch (params->u.vsb.modulation) {

		case VSB_8:

		case VSB_16:

	switch (delsys) {

	case SYS_ATSC:

		bw = 0; /* ATSC */

		break;

		case QAM_64:

		case QAM_256:

	case SYS_DVBC_ANNEX_B:

		bw = 1; /* US CABLE */

		break;

		default:

			err("%s: modulation not set!", __func__);

			return -EINVAL;

		}

	} else if (fe->ops.info.type == FE_OFDM) {

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

		case BANDWIDTH_6_MHZ:

	case SYS_DVBT:

		switch (c->bandwidth_hz) {

		case 6000000:

			bw = 6;

			break;

		case BANDWIDTH_7_MHZ:

		case 7000000:

			bw = 7;

			band = BANDWIDTH_7_MHZ;

			break;

		case BANDWIDTH_8_MHZ:

		case 8000000:

			bw = 8;

			band = BANDWIDTH_8_MHZ;

			break;

		default:

			err("%s: bandwidth not set!", __func__);

			return -EINVAL;

		}

	} else {

		break;

	default:

		err("%s: modulation type not supported!", __func__);

		return -EINVAL;

	}

	ret = mxl1x1sf_tune_rf(fe, params->frequency, bw);

	ret = mxl1x1sf_tune_rf(fe, c->frequency, bw);

	if (mxl_fail(ret))

		goto fail;



	state->frequency = params->frequency;

	state->bandwidth = (fe->ops.info.type == FE_OFDM) ?

		params->u.ofdm.bandwidth : 0;

	state->frequency = c->frequency;

	state->bandwidth = band;

fail:

	return ret;

}