microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[PATCH] dvb: frontend: stv0299: support reading both BER and UCBLOCKS 

Allow the stv0299 to read the BER and UCBLOCKS.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew de Quincey 2005-09-09 13:02:32 -07:00 коммит произвёл Linus Torvalds
Родитель a9d6a80b41
Коммит 78639a3f81
1 изменённых файлов: 5 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
drivers/media/dvb/frontends/stv0299.c
Просмотреть файл

@ -63,12 +63,8 @@ struct stv0299_state {
u32 tuner_frequency; u32 tuner_frequency;
u32 symbol_rate; u32 symbol_rate;
fe_code_rate_t fec_inner; fe_code_rate_t fec_inner;
int errmode;
}; };
#define STATUS_BER 0
#define STATUS_UCBLOCKS 1
static int debug; static int debug;
static int debug_legacy_dish_switch; static int debug_legacy_dish_switch;
#define dprintk(args...) \ #define dprintk(args...) \
@ -520,7 +516,8 @@ static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
{ {
struct stv0299_state* state = fe->demodulator_priv; struct stv0299_state* state = fe->demodulator_priv;
if (state->errmode != STATUS_BER) return 0; stv0299_writeregI(state, 0x34, (stv0299_readreg(state, 0x34) & 0xcf) | 0x10);
msleep(100);
*ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e); *ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
return 0; return 0;
@ -559,8 +556,9 @@ static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
{ {
struct stv0299_state* state = fe->demodulator_priv; struct stv0299_state* state = fe->demodulator_priv;
if (state->errmode != STATUS_UCBLOCKS) *ucblocks = 0; stv0299_writeregI(state, 0x34, (stv0299_readreg(state, 0x34) & 0xcf) | 0x30);
else *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e); msleep(100);
*ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
return 0; return 0;
} }
@ -709,7 +707,6 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
state->tuner_frequency = 0; state->tuner_frequency = 0;
state->symbol_rate = 0; state->symbol_rate = 0;
state->fec_inner = 0; state->fec_inner = 0;
state->errmode = STATUS_BER;
/* check if the demod is there */ /* check if the demod is there */
stv0299_writeregI(state, 0x02, 0x34); /* standby off */ stv0299_writeregI(state, 0x02, 0x34); /* standby off */