DVB-S2 multistream support
PATCH 1/1 DVB-S2 multistream support
Now present DTV_DVBT2_PLP_ID property for DVB-T2, so i add alias DTV_DVBS2_MIS_ID (same feature for advanced DVB-S2). Now DVB-S2 multistream filtration supported for current STV090x demod cut 3.0, so i implement support for stv090x demod driver. Additional fe-caps FE_CAN_MULTISTREAM also added.
include/linux/dvb/frontend.h +2 -0
@@ -62,6 +62,7 @@ typedef enum fe_caps {FE_CAN_8VSB =0x200000 ,FE_CAN_16VSB =0x400000 ,FE_HAS_EXTENDED_CAPS =0x800000 ,/* We need more bitspace for newer APIs, indicate this. */ +FE_CAN_MULTISTREAM =0x4000000 ,/* frontend supports DVB-S2 multistream filtering */ FE_CAN_TURBO_FEC =0x8000000 ,/* frontend supports "turbo fec modulation" */ FE_CAN_2G_MODULATION =0x10000000 ,/* frontend supports "2nd generation modulation" (DVB-S2) */ FE_NEEDS_BENDING = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */
@@ -317,6 +318,7 @@ struct dvb_frontend_event {#define DTV_ISDBS_TS_ID 42#define DTV_DVBT2_PLP_ID 43 +#define DTV_DVBS2_MIS_ID 43#define DTV_ENUM_DELSYS 44
drivers/media/dvb/dvb-core/dvb_frontend.c +1 -1
@@ -947,7 +947,7 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe) } c->isdbs_ts_id =0 ; - c->dvbt2_plp_id =0 ; + c->dvbt2_plp_id =-1 ;switch (c->delivery_system) {case SYS_DVBS :
drivers/media/dvb/frontends/stv090x.c +34 -0
@@ -3425,6 +3425,33 @@ err:return -1 ; } +static int stv090x_set_mis (struct stv090x_state *state,int mis) +{ +u32 reg; + +if (mis<0 || mis>255 ) { +dprintk (FE_DEBUG ,1 ,"Disable MIS filtering" ); + reg =STV090x_READ_DEMOD (state,PDELCTRL1 ); +STV090x_SETFIELD_Px (reg,FILTER_EN_FIELD ,0x00 ); +if (STV090x_WRITE_DEMOD (state,PDELCTRL1 , reg) <0 ) + goto err; + }else { +dprintk (FE_DEBUG ,1 ,"Enable MIS filtering - %d" , mis); + reg =STV090x_READ_DEMOD (state,PDELCTRL1 ); +STV090x_SETFIELD_Px (reg,FILTER_EN_FIELD ,0x01 ); +if (STV090x_WRITE_DEMOD (state,PDELCTRL1 , reg) <0 ) + goto err; +if (STV090x_WRITE_DEMOD (state,ISIENTRY , mis) <0 ) + goto err; +if (STV090x_WRITE_DEMOD (state,ISIBITENA ,0xff ) <0 ) + goto err; + } +return 0 ; +err: +dprintk (FE_ERROR ,1 ,"I/O error" ); +return -1 ; +} +static enum dvbfe_search stv090x_search (struct dvb_frontend *fe) {struct stv090x_state *state = fe->demodulator_priv;
@@ -3433,6 +3460,8 @@ static enum dvbfe_search stv090x_search(struct dvb_frontend *fe)if (props->frequency ==0 )return DVBFE_ALGO_SEARCH_INVALID ; +stv090x_set_mis (state,props->dvbt2_plp_id); + state->delsys = props->delivery_system; state->frequency = props->frequency; state->srate = props->symbol_rate;
@@ -3447,6 +3476,8 @@ static enum dvbfe_search stv090x_search(struct dvb_frontend *fe) state->search_range =5000000 ; } +stv090x_set_mis (state,props->dvbt2_plp_id); +if (stv090x_algo (state) == STV090x_RANGEOK) {dprintk (FE_DEBUG ,1 ,"Search success!" );return DVBFE_ALGO_SEARCH_SUCCESS ;
@@ -4798,6 +4829,9 @@ struct dvb_frontend *stv090x_attach(const struct stv090x_config *config, } } +if (state->internal->dev_ver>=0x30 ) + state->frontend.ops.info.caps |=FE_CAN_MULTISTREAM ; +/* workaround for stuck DiSEqC output */ if (config->diseqc_envelope_mode)stv090x_send_diseqc_burst (&state->frontend,SEC_MINI_A );