Commit 98293ef3 authored by HIRANO Takahito's avatar HIRANO Takahito Committed by Mauro Carvalho Chehab

V4L/DVB (12997): Add the DTV_ISDB_TS_ID property for ISDB_S

In ISDB-S, time-devision duplex is used to multiplexing several waves
in the same frequency. Each wave is identified by its own transport
stream ID, or TS ID. We need to provide some way to specify this ID
from user applications to handle ISDB-S frontends.

This code has been tested with the Earthsoft PT1 driver.

[mchehab@infradead.org: Fix merge conflicts with isdbt and rename the new parameter to DTV_ISDBS_TS_ID]
Signed-off-by: default avatarHIRANO Takahito <hiranotaka@zng.info>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0030ec38
...@@ -1031,6 +1031,8 @@ static struct dtv_cmds_h dtv_cmds[] = { ...@@ -1031,6 +1031,8 @@ static struct dtv_cmds_h dtv_cmds[] = {
_DTV_CMD(DTV_ISDBT_LAYERC_SEGMENT_COUNT, 0, 0), _DTV_CMD(DTV_ISDBT_LAYERC_SEGMENT_COUNT, 0, 0),
_DTV_CMD(DTV_ISDBT_LAYERC_TIME_INTERLEAVING, 0, 0), _DTV_CMD(DTV_ISDBT_LAYERC_TIME_INTERLEAVING, 0, 0),
_DTV_CMD(DTV_ISDBS_TS_ID, 1, 0),
/* Get */ /* Get */
[DTV_DISEQC_SLAVE_REPLY] = { [DTV_DISEQC_SLAVE_REPLY] = {
.name = "DTV_DISEQC_SLAVE_REPLY", .name = "DTV_DISEQC_SLAVE_REPLY",
...@@ -1420,6 +1422,9 @@ static int dtv_property_process_get(struct dvb_frontend *fe, ...@@ -1420,6 +1422,9 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
case DTV_ISDBT_LAYERC_TIME_INTERLEAVING: case DTV_ISDBT_LAYERC_TIME_INTERLEAVING:
tvp->u.data = fe->dtv_property_cache.layer[2].interleaving; tvp->u.data = fe->dtv_property_cache.layer[2].interleaving;
break; break;
case DTV_ISDBS_TS_ID:
tvp->u.data = fe->dtv_property_cache.isdbs_ts_id;
break;
default: default:
r = -1; r = -1;
} }
...@@ -1571,6 +1576,9 @@ static int dtv_property_process_set(struct dvb_frontend *fe, ...@@ -1571,6 +1576,9 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
case DTV_ISDBT_LAYERC_TIME_INTERLEAVING: case DTV_ISDBT_LAYERC_TIME_INTERLEAVING:
fe->dtv_property_cache.layer[2].interleaving = tvp->u.data; fe->dtv_property_cache.layer[2].interleaving = tvp->u.data;
break; break;
case DTV_ISDBS_TS_ID:
fe->dtv_property_cache.isdbs_ts_id = tvp->u.data;
break;
default: default:
r = -1; r = -1;
} }
......
...@@ -355,6 +355,9 @@ struct dtv_frontend_properties { ...@@ -355,6 +355,9 @@ struct dtv_frontend_properties {
fe_modulation_t modulation; fe_modulation_t modulation;
u8 interleaving; u8 interleaving;
} layer[3]; } layer[3];
/* ISDB-T specifics */
u32 isdbs_ts_id;
}; };
struct dvb_frontend { struct dvb_frontend {
......
...@@ -302,7 +302,9 @@ struct dvb_frontend_event { ...@@ -302,7 +302,9 @@ struct dvb_frontend_event {
#define DTV_ISDBT_LAYER_ENABLED 41 #define DTV_ISDBT_LAYER_ENABLED 41
#define DTV_MAX_COMMAND DTV_ISDBT_LAYER_ENABLED #define DTV_ISDBS_TS_ID 42
#define DTV_MAX_COMMAND DTV_ISDBS_TS_ID
typedef enum fe_pilot { typedef enum fe_pilot {
PILOT_ON, PILOT_ON,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment