redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] mxl5005s: use DVBv5 parameters on set_params()

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

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2011-12-21 07:10:58 -03:00
parent 82c0126ff2
commit 9818d7dff2
1 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
drivers/media/common/tuners/mxl5005s.c
View file

@ -3983,50 +3983,43 @@ static int mxl5005s_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params) struct dvb_frontend_parameters *params)
{ {
struct mxl5005s_state *state = fe->tuner_priv; struct mxl5005s_state *state = fe->tuner_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
u32 delsys = c->delivery_system;
u32 bw = c->bandwidth_hz;
u32 req_mode, req_bw = 0; u32 req_mode, req_bw = 0;
int ret; int ret;
dprintk(1, "%s()\n", __func__); dprintk(1, "%s()\n", __func__);
if (fe->ops.info.type == FE_ATSC) { switch (delsys) {
switch (params->u.vsb.modulation) { case SYS_ATSC:
case VSB_8: req_mode = MXL_ATSC;
req_mode = MXL_ATSC; break; req_bw = MXL5005S_BANDWIDTH_6MHZ;
default: break;
case QAM_64: case SYS_DVBC_ANNEX_B:
case QAM_256: req_mode = MXL_QAM;
case QAM_AUTO: req_bw = MXL5005S_BANDWIDTH_6MHZ;
req_mode = MXL_QAM; break; break;
} default: /* Assume DVB-T */
} else
req_mode = MXL_DVBT; req_mode = MXL_DVBT;
switch (bw) {
case 6000000:
req_bw = MXL5005S_BANDWIDTH_6MHZ;
break;
case 7000000:
req_bw = MXL5005S_BANDWIDTH_7MHZ;
break;
case 8000000:
case 0:
req_bw = MXL5005S_BANDWIDTH_8MHZ;
break;
default:
return -EINVAL;
}
}
/* Change tuner for new modulation type if reqd */ /* Change tuner for new modulation type if reqd */
if (req_mode != state->current_mode) { if (req_mode != state->current_mode) {
switch (req_mode) {
case MXL_ATSC:
case MXL_QAM:
req_bw = MXL5005S_BANDWIDTH_6MHZ;
break;
case MXL_DVBT:
default:
/* Assume DVB-T */
switch (params->u.ofdm.bandwidth) {
case BANDWIDTH_6_MHZ:
req_bw = MXL5005S_BANDWIDTH_6MHZ;
break;
case BANDWIDTH_7_MHZ:
req_bw = MXL5005S_BANDWIDTH_7MHZ;
break;
case BANDWIDTH_AUTO:
case BANDWIDTH_8_MHZ:
req_bw = MXL5005S_BANDWIDTH_8MHZ;
break;
default:
return -EINVAL;
}
}
state->current_mode = req_mode; state->current_mode = req_mode;
ret = mxl5005s_reconfigure(fe, req_mode, req_bw); ret = mxl5005s_reconfigure(fe, req_mode, req_bw);
@ -4034,8 +4027,8 @@ static int mxl5005s_set_params(struct dvb_frontend *fe,
ret = 0; ret = 0;
if (ret == 0) { if (ret == 0) {
dprintk(1, "%s() freq=%d\n", __func__, params->frequency); dprintk(1, "%s() freq=%d\n", __func__, c->frequency);
ret = mxl5005s_SetRfFreqHz(fe, params->frequency); ret = mxl5005s_SetRfFreqHz(fe, c->frequency);
} }
return ret; return ret;