Commit 56f0680a authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab

V4L/DVB (8995): S2API: tv_ / TV_ to dtv_ / DTV_ namespace changes

The group preferred dtv_ over tv_, this implements it.
Signed-off-by: default avatarSteven Toth <stoth@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cc8c4f3a
This diff is collapsed.
......@@ -170,8 +170,8 @@ struct dvb_frontend_ops {
struct dvb_tuner_ops tuner_ops;
struct analog_demod_ops analog_ops;
int (*set_property)(struct dvb_frontend* fe, tv_property_t* tvp);
int (*get_property)(struct dvb_frontend* fe, tv_property_t* tvp);
int (*set_property)(struct dvb_frontend* fe, dtv_property_t* tvp);
int (*get_property)(struct dvb_frontend* fe, dtv_property_t* tvp);
int (*set_params)(struct dvb_frontend* fe);
};
......@@ -186,7 +186,7 @@ struct dvb_fe_events {
struct mutex mtx;
};
struct tv_frontend_properties {
struct dtv_frontend_properties {
/* Cache State */
u32 state;
......@@ -233,7 +233,7 @@ struct dvb_frontend {
void *frontend_priv;
void *sec_priv;
void *analog_demod_priv;
struct tv_frontend_properties tv_property_cache;
struct dtv_frontend_properties dtv_property_cache;
};
extern int dvb_register_frontend(struct dvb_adapter *dvb,
......
......@@ -776,7 +776,7 @@ struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
static int cx24116_get_params(struct dvb_frontend* fe)
{
struct cx24116_state *state = fe->demodulator_priv;
struct tv_frontend_properties *cache = &fe->tv_property_cache;
struct dtv_frontend_properties *cache = &fe->dtv_property_cache;
dprintk("%s()\n",__func__);
......@@ -796,7 +796,7 @@ static int cx24116_initfe(struct dvb_frontend* fe)
return cx24116_diseqc_init(fe);
}
static int cx24116_set_property(struct dvb_frontend *fe, tv_property_t* tvp)
static int cx24116_set_property(struct dvb_frontend *fe, dtv_property_t* tvp)
{
dprintk("%s(..)\n", __func__);
return 0;
......@@ -814,7 +814,7 @@ static int cx24116_set_params(struct dvb_frontend *fe)
static int cx24116_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
{
struct cx24116_state *state = fe->demodulator_priv;
struct tv_frontend_properties *c = &fe->tv_property_cache;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct cx24116_cmd cmd;
fe_status_t tunerstat;
int ret, above30msps;
......
......@@ -250,61 +250,61 @@ struct dvb_frontend_event {
* don't insert random new commands and break backwards
* binary compatability.
*/
typedef enum tv_cmd_types {
TV_SEQ_UNDEFINED,
TV_SEQ_START,
TV_SEQ_CONTINUE,
TV_SEQ_COMPLETE,
TV_SEQ_TERMINATE,
TV_SET_FREQUENCY,
TV_SET_MODULATION,
TV_SET_BANDWIDTH,
TV_SET_INVERSION,
TV_SET_DISEQC_MASTER,
TV_SET_SYMBOLRATE,
TV_SET_INNERFEC,
TV_SET_VOLTAGE,
TV_SET_TONE,
TV_SET_PILOT,
TV_SET_ROLLOFF,
TV_GET_FREQUENCY,
TV_GET_MODULATION,
TV_GET_BANDWIDTH,
TV_GET_INVERSION,
TV_GET_DISEQC_SLAVE_REPLY,
TV_GET_SYMBOLRATE,
TV_GET_INNERFEC,
TV_GET_VOLTAGE,
TV_GET_TONE,
TV_GET_PILOT,
TV_GET_ROLLOFF,
typedef enum dtv_cmd_types {
DTV_SEQ_UNDEFINED,
DTV_SEQ_START,
DTV_SEQ_CONTINUE,
DTV_SEQ_COMPLETE,
DTV_SEQ_TERMINATE,
DTV_SET_FREQUENCY,
DTV_SET_MODULATION,
DTV_SET_BANDWIDTH,
DTV_SET_INVERSION,
DTV_SET_DISEQC_MASTER,
DTV_SET_SYMBOLRATE,
DTV_SET_INNERFEC,
DTV_SET_VOLTAGE,
DTV_SET_TONE,
DTV_SET_PILOT,
DTV_SET_ROLLOFF,
DTV_GET_FREQUENCY,
DTV_GET_MODULATION,
DTV_GET_BANDWIDTH,
DTV_GET_INVERSION,
DTV_GET_DISEQC_SLAVE_REPLY,
DTV_GET_SYMBOLRATE,
DTV_GET_INNERFEC,
DTV_GET_VOLTAGE,
DTV_GET_TONE,
DTV_GET_PILOT,
DTV_GET_ROLLOFF,
/* Basic enumeration set for querying unlimited capabilities */
TV_GET_FE_CAPABILITY_COUNT,
TV_GET_FE_CAPABILITY,
DTV_GET_FE_CAPABILITY_COUNT,
DTV_GET_FE_CAPABILITY,
/* New commands are always appended */
TV_SET_DELIVERY_SYSTEM,
TV_GET_DELIVERY_SYSTEM,
DTV_SET_DELIVERY_SYSTEM,
DTV_GET_DELIVERY_SYSTEM,
/* ISDB-T */
TV_SET_ISDB_SEGMENT_NUM,
TV_GET_ISDB_SEGMENT_NUM,
TV_SET_ISDB_SEGMENT_WIDTH,
TV_GET_ISDB_SEGMENT_WIDTH,
TV_GET_ISDB_LAYERA_FEC,
TV_GET_ISDB_LAYERA_MODULATION,
TV_GET_ISDB_LAYERA_SEGMENT_WIDTH,
TV_GET_ISDB_LAYERB_FEC,
TV_GET_ISDB_LAYERB_MODULATION,
TV_GET_ISDB_LAYERB_SEGMENT_WIDTH,
TV_GET_ISDB_LAYERC_FEC,
TV_GET_ISDB_LAYERC_MODULATION,
TV_GET_ISDB_LAYERC_SEGMENT_WIDTH,
} tv_cmd_types_t;
DTV_SET_ISDB_SEGMENT_NUM,
DTV_GET_ISDB_SEGMENT_NUM,
DTV_SET_ISDB_SEGMENT_WIDTH,
DTV_GET_ISDB_SEGMENT_WIDTH,
DTV_GET_ISDB_LAYERA_FEC,
DTV_GET_ISDB_LAYERA_MODULATION,
DTV_GET_ISDB_LAYERA_SEGMENT_WIDTH,
DTV_GET_ISDB_LAYERB_FEC,
DTV_GET_ISDB_LAYERB_MODULATION,
DTV_GET_ISDB_LAYERB_SEGMENT_WIDTH,
DTV_GET_ISDB_LAYERC_FEC,
DTV_GET_ISDB_LAYERC_MODULATION,
DTV_GET_ISDB_LAYERC_SEGMENT_WIDTH,
} dtv_cmd_types_t;
typedef enum fe_pilot {
PILOT_ON,
......@@ -337,7 +337,7 @@ typedef enum fe_delivery_system {
SYS_DAB,
} fe_delivery_system_t;
struct tv_cmds_h {
struct dtv_cmds_h {
char *name; /* A display name for debugging purposes */
__u32 cmd; /* A unique ID */
......@@ -357,13 +357,13 @@ typedef struct {
__u32 len;
} buffer;
} u;
} tv_property_t;
} dtv_property_t;
/* No more than 16 properties during any given ioctl */
typedef tv_property_t tv_properties_t[16];
typedef dtv_property_t dtv_properties_t[16];
#define FE_SET_PROPERTY _IOW('o', 82, tv_properties_t)
#define FE_GET_PROPERTY _IOR('o', 83, tv_properties_t)
#define FE_SET_PROPERTY _IOW('o', 82, dtv_properties_t)
#define FE_GET_PROPERTY _IOR('o', 83, dtv_properties_t)
/**
......
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