Skip to content

L
linux
Commit 249fa0b0 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

[media] dvb: remove dvb_frontend_parameters from calc_regs() 

The calc_regs() callback is used by a few frontends (mt352, nxt200x,
digitv and zl10353). On all places it is called, the parameters are
set by DVBv5 way. So, just use the DVBv5 struct and remove the
extra parameter.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1466194d
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 57 deletions
drivers/media/common/tuners/tuner-simple.c
View file @ 249fa0b0
......@@ -884,7 +884,6 @@ static u32 simple_dvb_configure(struct dvb_frontend *fe, u8 *buf,
}
static int simple_dvb_calc_regs(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params,
u8 *buf, int buf_len)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
......@@ -896,28 +895,14 @@ static int simple_dvb_calc_regs(struct dvb_frontend *fe,
if (buf_len < 5)
return -EINVAL;
switch (delsys) {
case SYS_DVBT:
case SYS_DVBT2:
if (params->u.ofdm.bandwidth == BANDWIDTH_6_MHZ)
bw = 6000000;
if (params->u.ofdm.bandwidth == BANDWIDTH_7_MHZ)
bw = 7000000;
if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ)
bw = 8000000;
break;
default:
break;
}
frequency = simple_dvb_configure(fe, buf+1, delsys, params->frequency, bw);
frequency = simple_dvb_configure(fe, buf+1, delsys, c->frequency, bw);
if (frequency == 0)
return -EINVAL;
buf[0] = priv->i2c_props.addr;
priv->frequency = frequency;
priv->bandwidth = (fe->ops.info.type == FE_OFDM) ?
params->u.ofdm.bandwidth : 0;
priv->bandwidth = c->bandwidth_hz;
return 5;
}
......@@ -1044,7 +1029,17 @@ static int simple_get_frequency(struct dvb_frontend *fe, u32 *frequency)
static int simple_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
{
struct tuner_simple_priv *priv = fe->tuner_priv;
*bandwidth = priv->bandwidth;
switch (priv->bandwidth) {
case 6000000:
*bandwidth = BANDWIDTH_6_MHZ;
break;
case 7000000:
*bandwidth = BANDWIDTH_7_MHZ;
break;
case 8000000:
*bandwidth = BANDWIDTH_8_MHZ;
break;
}
return 0;
}
......
drivers/media/dvb/bt8xx/dvb-bt8xx.c
View file @ 249fa0b0
......@@ -148,8 +148,9 @@ static int thomson_dtt7579_demod_init(struct dvb_frontend* fe)
return 0;
}
static int thomson_dtt7579_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)
static int thomson_dtt7579_tuner_calc_regs(struct dvb_frontend *fe, u8* pllbuf, int buf_len)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
u32 div;
unsigned char bs = 0;
unsigned char cp = 0;
......@@ -157,18 +158,18 @@ static int thomson_dtt7579_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_f
if (buf_len < 5)
return -EINVAL;
div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
div = (((c->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
if (params->frequency < 542000000)
if (c->frequency < 542000000)
cp = 0xb4;
else if (params->frequency < 771000000)
else if (c->frequency < 771000000)
cp = 0xbc;
else
cp = 0xf4;
if (params->frequency == 0)
if (c->frequency == 0)
bs = 0x03;
else if (params->frequency < 443250000)
else if (c->frequency < 443250000)
bs = 0x02;
else
bs = 0x08;
......@@ -342,50 +343,51 @@ static int advbt771_samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe)
return 0;
}
static int advbt771_samsung_tdtc9251dh0_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)
static int advbt771_samsung_tdtc9251dh0_tuner_calc_regs(struct dvb_frontend *fe, u8 *pllbuf, int buf_len)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
u32 div;
unsigned char bs = 0;
unsigned char cp = 0;
if (buf_len < 5) return -EINVAL;
div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
div = (((c->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
if (params->frequency < 150000000)
if (c->frequency < 150000000)
cp = 0xB4;
else if (params->frequency < 173000000)
else if (c->frequency < 173000000)
cp = 0xBC;
else if (params->frequency < 250000000)
else if (c->frequency < 250000000)
cp = 0xB4;
else if (params->frequency < 400000000)
else if (c->frequency < 400000000)
cp = 0xBC;
else if (params->frequency < 420000000)
else if (c->frequency < 420000000)
cp = 0xF4;
else if (params->frequency < 470000000)
else if (c->frequency < 470000000)
cp = 0xFC;
else if (params->frequency < 600000000)
else if (c->frequency < 600000000)
cp = 0xBC;
else if (params->frequency < 730000000)
else if (c->frequency < 730000000)
cp = 0xF4;
else
cp = 0xFC;
if (params->frequency < 150000000)
if (c->frequency < 150000000)
bs = 0x01;
else if (params->frequency < 173000000)
else if (c->frequency < 173000000)
bs = 0x01;
else if (params->frequency < 250000000)
else if (c->frequency < 250000000)
bs = 0x02;
else if (params->frequency < 400000000)
else if (c->frequency < 400000000)
bs = 0x02;
else if (params->frequency < 420000000)
else if (c->frequency < 420000000)
bs = 0x02;
else if (params->frequency < 470000000)
else if (c->frequency < 470000000)
bs = 0x02;
else if (params->frequency < 600000000)
else if (c->frequency < 600000000)
bs = 0x08;
else if (params->frequency < 730000000)
else if (c->frequency < 730000000)
bs = 0x08;
else
bs = 0x08;
......@@ -514,31 +516,31 @@ static int digitv_alps_tded4_demod_init(struct dvb_frontend* fe)
return 0;
}
static int digitv_alps_tded4_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)
static int digitv_alps_tded4_tuner_calc_regs(struct dvb_frontend *fe, u8 *pllbuf, int buf_len)
{
u32 div;
struct dvb_ofdm_parameters *op = &params->u.ofdm;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
if (buf_len < 5)
return -EINVAL;
div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
div = (((c->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
pllbuf[0] = 0x61;
pllbuf[1] = (div >> 8) & 0x7F;
pllbuf[2] = div & 0xFF;
pllbuf[3] = 0x85;
dprintk("frequency %u, div %u\n", params->frequency, div);
dprintk("frequency %u, div %u\n", c->frequency, div);
if (params->frequency < 470000000)
if (c->frequency < 470000000)
pllbuf[4] = 0x02;
else if (params->frequency > 823000000)
else if (c->frequency > 823000000)
pllbuf[4] = 0x88;
else
pllbuf[4] = 0x08;
if (op->bandwidth == 8)
if (c->bandwidth_hz == 8000000)
pllbuf[4] |= 0x04;
return 5;
......
drivers/media/dvb/dvb-core/dvb_frontend.h
View file @ 249fa0b0
......@@ -202,7 +202,7 @@ struct dvb_tuner_ops {
int (*set_analog_params)(struct dvb_frontend *fe, struct analog_parameters *p);
/** This is support for demods like the mt352 - fills out the supplied buffer with what to write. */
int (*calc_regs)(struct dvb_frontend *fe, struct dvb_frontend_parameters *p, u8 *buf, int buf_len);
int (*calc_regs)(struct dvb_frontend *fe, u8 *buf, int buf_len);
/** This is to allow setting tuner-specific configs */
int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
......
drivers/media/dvb/dvb-usb/digitv.c
View file @ 249fa0b0
......@@ -123,7 +123,7 @@ static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
struct dvb_usb_adapter *adap = fe->dvb->priv;
u8 b[5];
fe->ops.tuner_ops.calc_regs(fe, fep, b, sizeof(b));
fe->ops.tuner_ops.calc_regs(fe, b, sizeof(b));
if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1);
return digitv_ctrl_msg(adap->dev, USB_WRITE_TUNER, 0, &b[1], 4, NULL, 0);
......
drivers/media/dvb/frontends/dvb-pll.c
View file @ 249fa0b0
......@@ -647,9 +647,9 @@ static int dvb_pll_set_params(struct dvb_frontend *fe,
}
static int dvb_pll_calc_regs(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params,
u8 *buf, int buf_len)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct dvb_pll_priv *priv = fe->tuner_priv;
int result;
u32 frequency = 0;
......@@ -657,7 +657,7 @@ static int dvb_pll_calc_regs(struct dvb_frontend *fe,
if (buf_len < 5)
return -EINVAL;
result = dvb_pll_configure(fe, buf + 1, params->frequency);
result = dvb_pll_configure(fe, buf + 1, c->frequency);
if (result < 0)
return result;
else
......@@ -666,7 +666,7 @@ static int dvb_pll_calc_regs(struct dvb_frontend *fe,
buf[0] = priv->pll_i2c_address;
priv->frequency = frequency;
priv->bandwidth = (fe->ops.info.type == FE_OFDM) ? params->u.ofdm.bandwidth : 0;
priv->bandwidth = c->bandwidth_hz;
return 5;
}
......
drivers/media/dvb/frontends/mt352.c
View file @ 249fa0b0
......@@ -302,7 +302,7 @@ static int mt352_set_parameters(struct dvb_frontend* fe,
_mt352_write(fe, fsm_go, 2);
} else {
if (fe->ops.tuner_ops.calc_regs) {
fe->ops.tuner_ops.calc_regs(fe, param, buf+8, 5);
fe->ops.tuner_ops.calc_regs(fe, buf+8, 5);
buf[8] <<= 1;
_mt352_write(fe, buf, sizeof(buf));
_mt352_write(fe, tuner_go, 2);
......
drivers/media/dvb/frontends/nxt200x.c
View file @ 249fa0b0
......@@ -566,7 +566,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
if (fe->ops.tuner_ops.calc_regs) {
/* get tuning information */
fe->ops.tuner_ops.calc_regs(fe, p, buf, 5);
fe->ops.tuner_ops.calc_regs(fe, buf, 5);
/* write frequency information */
nxt200x_writetuner(state, buf);
......
drivers/media/dvb/frontends/zl10353.c
View file @ 249fa0b0
......@@ -367,7 +367,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
fe->ops.i2c_gate_ctrl(fe, 0);
}
} else if (fe->ops.tuner_ops.calc_regs) {
fe->ops.tuner_ops.calc_regs(fe, param, pllbuf + 1, 5);
fe->ops.tuner_ops.calc_regs(fe, pllbuf + 1, 5);
pllbuf[1] <<= 1;
zl10353_write(fe, pllbuf, sizeof(pllbuf));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7