Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7876ad75 authored by Oliver Endriss's avatar Oliver Endriss Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8075): stv0299: Uncorrected block count and bit error rate fixed 



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: default avatarOliver Endriss <o.endriss@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0b915e74

drivers/media/dvb/frontends/stv0299.c

+11 −4
Original line number Diff line number Diff line
@@ -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;

}