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

[media] cx24120: Convert read_ber to retrieve from cache 

Instead of reading BER again for DVBv3 call, use the value from the cache.

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-19 15:29:44 -03:00 committed by Mauro Carvalho Chehab
parent ddcb252e41
commit fc44328478
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,6 +152,7 @@ struct cx24120_state {
/* ber stats calulations */ /* ber stats calulations */
u32 berw_usecs; u32 berw_usecs;
u32 ber_prev;
unsigned long ber_jiffies_stats; unsigned long ber_jiffies_stats;
}; };
@ -338,12 +339,15 @@ static int cx24120_read_snr(struct dvb_frontend *fe, u16 *snr)
static int cx24120_read_ber(struct dvb_frontend *fe, u32 *ber) static int cx24120_read_ber(struct dvb_frontend *fe, u32 *ber)
{ {
struct cx24120_state *state = fe->demodulator_priv; struct cx24120_state *state = fe->demodulator_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
*ber = (cx24120_readreg(state, CX24120_REG_BER_HH) << 24) | if (c->post_bit_error.stat[0].scale != FE_SCALE_COUNTER) {
(cx24120_readreg(state, CX24120_REG_BER_HL) << 16) | *ber = 0;
(cx24120_readreg(state, CX24120_REG_BER_LH) << 8) | return 0;
cx24120_readreg(state, CX24120_REG_BER_LL); }
dev_dbg(&state->i2c->dev, "read BER index = %d\n", *ber);
*ber = c->post_bit_error.stat[0].uvalue - state->ber_prev;
state->ber_prev = c->post_bit_error.stat[0].uvalue;
return 0; return 0;
} }
@ -661,9 +665,11 @@ static void cx24120_get_stats(struct cx24120_state *state)
msecs = (state->berw_usecs + 500) / 1000; msecs = (state->berw_usecs + 500) / 1000;
state->ber_jiffies_stats = jiffies + msecs_to_jiffies(msecs); state->ber_jiffies_stats = jiffies + msecs_to_jiffies(msecs);
ret = cx24120_read_ber(fe, &ber); ber = cx24120_readreg(state, CX24120_REG_BER_HH) << 24;
if (ret != 0) ber |= cx24120_readreg(state, CX24120_REG_BER_HL) << 16;
return; ber |= cx24120_readreg(state, CX24120_REG_BER_LH) << 8;
ber |= cx24120_readreg(state, CX24120_REG_BER_LL);
dev_dbg(&state->i2c->dev, "read BER index = %d\n", ber);
c->post_bit_error.stat[0].scale = FE_SCALE_COUNTER; c->post_bit_error.stat[0].scale = FE_SCALE_COUNTER;
c->post_bit_error.stat[0].uvalue += ber; c->post_bit_error.stat[0].uvalue += ber;