[media] stv0900: Multistream support

Multistream support for stv0900. For Netup Dual S2 CI with STV0900BAC/AAC.

Signed-off-by: Evgeny Plehov <EvgenyPlehov@ukr.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Evgeny Plehov 2012-11-29 15:27:38 -03:00 committed by Mauro Carvalho Chehab
parent 55ee64b30a
commit 73ec66c000
2 changed files with 29 additions and 0 deletions

View File

@ -1558,6 +1558,27 @@ static int stv0900_status(struct stv0900_internal *intp,
return locked;
}
static int stv0900_set_mis(struct stv0900_internal *intp,
enum fe_stv0900_demod_num demod, int mis)
{
enum fe_stv0900_error error = STV0900_NO_ERROR;
dprintk("%s\n", __func__);
if (mis < 0 || mis > 255) {
dprintk("Disable MIS filtering\n");
stv0900_write_bits(intp, FILTER_EN, 0);
} else {
dprintk("Enable MIS filtering - %d\n", mis);
stv0900_write_bits(intp, FILTER_EN, 1);
stv0900_write_reg(intp, ISIENTRY, mis);
stv0900_write_reg(intp, ISIBITENA, 0xff);
}
return error;
}
static enum dvbfe_search stv0900_search(struct dvb_frontend *fe)
{
struct stv0900_state *state = fe->demodulator_priv;
@ -1578,6 +1599,8 @@ static enum dvbfe_search stv0900_search(struct dvb_frontend *fe)
if (state->config->set_ts_params)
state->config->set_ts_params(fe, 0);
stv0900_set_mis(intp, demod, c->stream_id);
p_result.locked = FALSE;
p_search.path = demod;
p_search.frequency = c->frequency;
@ -1935,6 +1958,9 @@ struct dvb_frontend *stv0900_attach(const struct stv0900_config *config,
if (err_stv0900)
goto error;
if (state->internal->chip_id >= 0x30)
state->frontend.ops.info.caps |= FE_CAN_MULTISTREAM;
break;
default:
goto error;

View File

@ -3446,8 +3446,11 @@ extern s32 shiftx(s32 x, int demod, s32 shift);
#define R0900_P1_PDELCTRL1 0xf550
#define PDELCTRL1 REGx(R0900_P1_PDELCTRL1)
#define F0900_P1_INV_MISMASK 0xf5500080
#define INV_MISMASK FLDx(F0900_P1_INV_MISMASK)
#define F0900_P1_FILTER_EN 0xf5500020
#define FILTER_EN FLDx(F0900_P1_FILTER_EN)
#define F0900_P1_EN_MIS00 0xf5500002
#define EN_MIS00 FLDx(F0900_P1_EN_MIS00)
#define F0900_P1_ALGOSWRST 0xf5500001
#define ALGOSWRST FLDx(F0900_P1_ALGOSWRST)