UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] cx24120: Return DVBv3 signal strength from cache 

This patch changes DVBv3 signal strength to read from the cache by
moving the signal strength reading routine into get_stat, and
reducing read_signal_strength to just returning the cached value.

Signed-off-by: Jemma Denson <jdenson@gmail.com>
Signed-off-by: Patrick Boettcher <patrick.boettcher@posteo.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Jemma Denson 2015-05-05 17:47:55 -03:00 committed by Mauro Carvalho Chehab
parent 1462612cb3
commit 34ce475d32
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/media/dvb-frontends/cx24120.c
View File

@ -422,28 +422,14 @@ static int cx24120_read_signal_strength(struct dvb_frontend *fe,
u16 *signal_strength) u16 *signal_strength)
{ {
struct cx24120_state *state = fe->demodulator_priv; struct cx24120_state *state = fe->demodulator_priv;
struct cx24120_cmd cmd; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret, sigstr_h, sigstr_l;
cmd.id = CMD_READ_SNR; if (c->strength.stat[0].scale != FE_SCALE_RELATIVE)
cmd.len = 1; *signal_strength = 0;
cmd.arg[0] = 0x00; else
*signal_strength = c->strength.stat[0].uvalue;
ret = cx24120_message_send(state, &cmd); dev_dbg(&state->i2c->dev, "%s: Signal strength from cache: 0x%x\n",
if (ret != 0) {
err("error reading signal strength\n");
return -EREMOTEIO;
}
/* raw */
sigstr_h = (cx24120_readreg(state, CX24120_REG_SIGSTR_H) >> 6) << 8;
sigstr_l = cx24120_readreg(state, CX24120_REG_SIGSTR_L);
dev_dbg(&state->i2c->dev, "%s: Signal strength from firmware= 0x%x\n",
__func__, (sigstr_h | sigstr_l));
/* cooked */
*signal_strength = ((sigstr_h | sigstr_l) << 5) & 0x0000ffff;
dev_dbg(&state->i2c->dev, "%s: Signal strength= 0x%x\n",
__func__, *signal_strength); __func__, *signal_strength);
return 0; return 0;
@ -621,16 +607,34 @@ static void cx24120_get_stats(struct cx24120_state *state)
{ {
struct dvb_frontend *fe = &state->frontend; struct dvb_frontend *fe = &state->frontend;
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret; struct cx24120_cmd cmd;
int ret, sigstr_h, sigstr_l;
u16 u16tmp; u16 u16tmp;
dev_dbg(&state->i2c->dev, "%s()\n", __func__); dev_dbg(&state->i2c->dev, "%s()\n", __func__);
/* signal strength */ /* signal strength */
if (state->fe_status & FE_HAS_SIGNAL) { if (state->fe_status & FE_HAS_SIGNAL) {
ret = cx24120_read_signal_strength(fe, &u16tmp); cmd.id = CMD_READ_SNR;
if (ret != 0) cmd.len = 1;
cmd.arg[0] = 0x00;
ret = cx24120_message_send(state, &cmd);
if (ret != 0) {
err("error reading signal strength\n");
return; return;
}
/* raw */
sigstr_h = (cx24120_readreg(state, CX24120_REG_SIGSTR_H) >> 6) << 8;
sigstr_l = cx24120_readreg(state, CX24120_REG_SIGSTR_L);
dev_dbg(&state->i2c->dev, "%s: Signal strength from firmware= 0x%x\n",
__func__, (sigstr_h | sigstr_l));
/* cooked */
u16tmp = ((sigstr_h | sigstr_l) << 5) & 0x0000ffff;
dev_dbg(&state->i2c->dev, "%s: Signal strength= 0x%x\n",
__func__, u16tmp);
c->strength.stat[0].scale = FE_SCALE_RELATIVE; c->strength.stat[0].scale = FE_SCALE_RELATIVE;
c->strength.stat[0].uvalue = u16tmp; c->strength.stat[0].uvalue = u16tmp;