change physical layer scrambling API to DTV_PLS and support old API

mixed with DTV_STREAM_ID
This commit is contained in:
Ralph Metzler
2016-06-16 15:42:18 +02:00
parent 805a3ffeed
commit 2c8fcc1df5
5 changed files with 25 additions and 21 deletions

View File

@@ -955,7 +955,7 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
}
c->stream_id = NO_STREAM_ID_FILTER;
c->scrambling_code = NO_SCRAMBLING_CODE;
c->pls = NO_SCRAMBLING_CODE;
switch (c->delivery_system) {
case SYS_DVBS:
@@ -1032,7 +1032,7 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = {
_DTV_CMD(DTV_DVBT2_PLP_ID_LEGACY, 1, 0),
_DTV_CMD(DTV_LNA, 1, 0),
_DTV_CMD(DTV_INPUT, 1, 0),
_DTV_CMD(DTV_SCRAMBLING_CODE, 1, 0),
_DTV_CMD(DTV_PLS, 1, 0),
/* Get */
_DTV_CMD(DTV_DISEQC_SLAVE_REPLY, 0, 1),
@@ -1464,8 +1464,8 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
tvp->u.buffer.len = 4;
break;
case DTV_SCRAMBLING_CODE:
tvp->u.data = c->scrambling_code;
case DTV_PLS:
tvp->u.data = c->pls;
break;
/* Fill quality measures */
@@ -1907,8 +1907,8 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
r = fe->ops.set_input(fe, c->input);
break;
case DTV_SCRAMBLING_CODE:
c->scrambling_code = tvp->u.data;
case DTV_PLS:
c->pls = tvp->u.data;
break;
default:

View File

@@ -397,7 +397,7 @@ struct dtv_frontend_properties {
u32 lna;
s32 input;
u32 scrambling_code;
u32 pls;
/* statistics data */
struct dtv_fe_stats strength;