提交 9e35cd22 编写于 作者: A Antti Palosaari 提交者: Mauro Carvalho Chehab

[media] af9013: cache some reg values to reduce reg reads

Demod + tuner specific RF AGC and IF AGC limit values are read from demod
memory in every signal strength query. Cache those to reduce I2C traffic.
Signed-off-by: NAntti Palosaari <crope@iki.fi>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 edb709b6
...@@ -42,6 +42,8 @@ struct af9013_state { ...@@ -42,6 +42,8 @@ struct af9013_state {
struct af9013_config config; struct af9013_config config;
/* tuner/demod RF and IF AGC limits used for signal strength calc */
u8 signal_strength_en, rf_50, rf_80, if_50, if_80;
u16 signal_strength; u16 signal_strength;
u32 ber; u32 ber;
u32 ucblocks; u32 ucblocks;
...@@ -963,45 +965,31 @@ static int af9013_update_signal_strength(struct dvb_frontend *fe) ...@@ -963,45 +965,31 @@ static int af9013_update_signal_strength(struct dvb_frontend *fe)
{ {
struct af9013_state *state = fe->demodulator_priv; struct af9013_state *state = fe->demodulator_priv;
int ret; int ret;
u8 tmp0; u8 rf_gain, if_gain;
u8 rf_gain, rf_50, rf_80, if_gain, if_50, if_80;
int signal_strength; int signal_strength;
deb_info("%s\n", __func__); deb_info("%s\n", __func__);
state->signal_strength = 0; if (state->signal_strength_en) {
ret = af9013_read_reg_bits(state, 0x9bee, 0, 1, &tmp0);
if (ret)
goto error;
if (tmp0) {
ret = af9013_read_reg(state, 0x9bbd, &rf_50);
if (ret)
goto error;
ret = af9013_read_reg(state, 0x9bd0, &rf_80);
if (ret)
goto error;
ret = af9013_read_reg(state, 0x9be2, &if_50);
if (ret)
goto error;
ret = af9013_read_reg(state, 0x9be4, &if_80);
if (ret)
goto error;
ret = af9013_read_reg(state, 0xd07c, &rf_gain); ret = af9013_read_reg(state, 0xd07c, &rf_gain);
if (ret) if (ret)
goto error; goto error;
ret = af9013_read_reg(state, 0xd07d, &if_gain); ret = af9013_read_reg(state, 0xd07d, &if_gain);
if (ret) if (ret)
goto error; goto error;
signal_strength = (0xffff / (9 * (rf_50 + if_50) - \ signal_strength = (0xffff / \
11 * (rf_80 + if_80))) * (10 * (rf_gain + if_gain) - \ (9 * (state->rf_50 + state->if_50) - \
11 * (rf_80 + if_80)); 11 * (state->rf_80 + state->if_80))) * \
(10 * (rf_gain + if_gain) - \
11 * (state->rf_80 + state->if_80));
if (signal_strength < 0) if (signal_strength < 0)
signal_strength = 0; signal_strength = 0;
else if (signal_strength > 0xffff) else if (signal_strength > 0xffff)
signal_strength = 0xffff; signal_strength = 0xffff;
state->signal_strength = signal_strength; state->signal_strength = signal_strength;
} else {
state->signal_strength = 0;
} }
error: error:
...@@ -1306,6 +1294,27 @@ static int af9013_init(struct dvb_frontend *fe) ...@@ -1306,6 +1294,27 @@ static int af9013_init(struct dvb_frontend *fe)
if (ret) if (ret)
goto error; goto error;
/* read values needed for signal strength calculation */
ret = af9013_read_reg_bits(state, 0x9bee, 0, 1,
&state->signal_strength_en);
if (ret)
goto error;
if (state->signal_strength_en) {
ret = af9013_read_reg(state, 0x9bbd, &state->rf_50);
if (ret)
goto error;
ret = af9013_read_reg(state, 0x9bd0, &state->rf_80);
if (ret)
goto error;
ret = af9013_read_reg(state, 0x9be2, &state->if_50);
if (ret)
goto error;
ret = af9013_read_reg(state, 0x9be4, &state->if_80);
if (ret)
goto error;
}
error: error:
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册