Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-15 15:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] dib8000: Fix UCB measure with DVBv5 stats

Browse Source 
On dib8000, the block error count is a monotonic 32 bits register.
With DVBv5 stats, we use a 64 bits counter, that it is reset
when a new channel is tuned.

Change the UCB counting start from 0 and to be returned with
64 bits, just like the API requests.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: Patrick Boettcher <pboettcher@kernellabs.com>
This commit is contained in:
Mauro Carvalho Chehab 2013-12-17 04:55:26 -03:00
parent 42ff76bdb0
commit 7a9d85d555
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/media/dvb-frontends/dib8000.c
View File

@ -119,6 +119,7 @@ struct dib8000_state {
u8 longest_intlv_layer;
u16 output_mode;
s64 init_ucb;
#ifdef DIB8000_AGC_FREEZE
u16 agc1_max;
u16 agc1_min;
@ -986,10 +987,13 @@ static u16 dib8000_identify(struct i2c_device *client)
return value;
}
static int dib8000_read_unc_blocks(struct dvb_frontend *fe, u32 *unc);
static void dib8000_reset_stats(struct dvb_frontend *fe)
{
struct dib8000_state *state = fe->demodulator_priv;
struct dtv_frontend_properties *c = &state->fe[0]->dtv_property_cache;
u32 ucb;
memset(&c->strength, 0, sizeof(c->strength));
memset(&c->cnr, 0, sizeof(c->cnr));
@ -1010,6 +1014,9 @@ static void dib8000_reset_stats(struct dvb_frontend *fe)
c->block_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
c->post_bit_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
c->post_bit_count.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
dib8000_read_unc_blocks(fe, &ucb);
state->init_ucb = -ucb;
}
static int dib8000_reset(struct dvb_frontend *fe)
@ -3989,14 +3996,12 @@ static int dib8000_get_stats(struct dvb_frontend *fe, fe_status_t stat)
c->post_bit_count.stat[0].scale = FE_SCALE_COUNTER;
c->post_bit_count.stat[0].uvalue += 100000000;
/*
* FIXME: this is refreshed on every second, but a time
* drift between dib8000 and PC clock may cause troubles
*/
dib8000_read_unc_blocks(fe, &val);
if (val < state->init_ucb)
state->init_ucb += 1L << 32;
c->block_error.stat[0].scale = FE_SCALE_COUNTER;
c->block_error.stat[0].uvalue += val;
c->block_error.stat[0].uvalue = val + state->init_ucb;
if (state->revision < 0x8002)
return 0;