diff options
| author | Oliver Endriss <o.endriss@gmx.de> | 2008-06-20 01:25:04 +0200 |
|---|---|---|
| committer | Oliver Endriss <o.endriss@gmx.de> | 2008-06-20 01:25:04 +0200 |
| commit | 50a2790a7f9cfc0f6dd877d6902dc97feb915254 (patch) | |
| tree | 5ea83ece77e9c88eab9863ff919569ea537a67e5 /linux/drivers/media/dvb/frontends | |
| parent | 64d6aa16c2142189fbf45851d7742c7ccc6c5922 (diff) | |
| download | mediapointer-dvb-s2-50a2790a7f9cfc0f6dd877d6902dc97feb915254.tar.gz mediapointer-dvb-s2-50a2790a7f9cfc0f6dd877d6902dc97feb915254.tar.bz2 | |
stv0299: Uncorrected block count and bit error rate fixed
From: Oliver Endriss <o.endriss@gmx.de>
Fix uncorrected block counter and bit error rate to follow DVB API spec:
- Unsupported controls return -ENOSYS.
- UNC must never be set to 0.
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Diffstat (limited to 'linux/drivers/media/dvb/frontends')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/stv0299.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c index 17556183e..35435bef8 100644 --- a/linux/drivers/media/dvb/frontends/stv0299.c +++ b/linux/drivers/media/dvb/frontends/stv0299.c @@ -63,6 +63,7 @@ struct stv0299_state { u32 symbol_rate; fe_code_rate_t fec_inner; int errmode; + u32 ucblocks; }; #define STATUS_BER 0 @@ -501,8 +502,10 @@ static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber) { struct stv0299_state* state = fe->demodulator_priv; - if (state->errmode != STATUS_BER) return 0; - *ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e); + if (state->errmode != STATUS_BER) + return -ENOSYS; + + *ber = stv0299_readreg(state, 0x1e) | (stv0299_readreg(state, 0x1d) << 8); return 0; } @@ -540,8 +543,12 @@ static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) { struct stv0299_state* state = fe->demodulator_priv; - if (state->errmode != STATUS_UCBLOCKS) *ucblocks = 0; - else *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e); + if (state->errmode != STATUS_UCBLOCKS) + return -ENOSYS; + + state->ucblocks += stv0299_readreg(state, 0x1e); + state->ucblocks += (stv0299_readreg(state, 0x1d) << 8); + *ucblocks = state->ucblocks; return 0; } |