Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83165689 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9025): S2API: Deactivate the ISDB-T definitions 



We don't want to push the ISDB-T definitions into the kernel until
we have a high level of confidence in the ISDB-T API. More testing
is required before this code is released.

Signed-off-by: default avatarSteven Toth <stoth@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fc6e8c28

drivers/media/dvb/dvb-core/dvb_frontend.c

+0 −99
Original line number Diff line number Diff line
@@ -829,17 +829,6 @@ struct dtv_cmds_h dtv_cmds[] = { 
		.cmd	= DTV_DELIVERY_SYSTEM,

		.set	= 1,

	},

	[DTV_ISDB_SEGMENT_IDX] = {

		.name	= "DTV_ISDB_SEGMENT_IDX",

		.cmd	= DTV_ISDB_SEGMENT_IDX,

		.set	= 1,

	},

	[DTV_ISDB_SEGMENT_WIDTH] = {

		.name	= "DTV_ISDB_SEGMENT_WIDTH",

		.cmd	= DTV_ISDB_SEGMENT_WIDTH,

		.set	= 1,

	},



	/* Get */

	[DTV_DISEQC_SLAVE_REPLY] = {

		.name	= "DTV_DISEQC_SLAVE_REPLY",
@@ -847,51 +836,6 @@ struct dtv_cmds_h dtv_cmds[] = { 
		.set	= 0,

		.buffer	= 1,

	},

	[DTV_ISDB_LAYERA_FEC] = {

		.name	= "DTV_ISDB_LAYERA_FEC",

		.cmd	= DTV_ISDB_LAYERA_FEC,

		.set	= 0,

	},

	[DTV_ISDB_LAYERA_MODULATION] = {

		.name	= "DTV_ISDB_LAYERA_MODULATION",

		.cmd	= DTV_ISDB_LAYERA_MODULATION,

		.set	= 0,

	},

	[DTV_ISDB_LAYERA_SEGMENT_WIDTH] = {

		.name	= "DTV_ISDB_LAYERA_SEGMENT_WIDTH",

		.cmd	= DTV_ISDB_LAYERA_SEGMENT_WIDTH,

		.set	= 0,

	},

	[DTV_ISDB_LAYERB_FEC] = {

		.name	= "DTV_ISDB_LAYERB_FEC",

		.cmd	= DTV_ISDB_LAYERB_FEC,

		.set	= 0,

	},

	[DTV_ISDB_LAYERB_MODULATION] = {

		.name	= "DTV_ISDB_LAYERB_MODULATION",

		.cmd	= DTV_ISDB_LAYERB_MODULATION,

		.set	= 0,

	},

	[DTV_ISDB_LAYERB_SEGMENT_WIDTH] = {

		.name	= "DTV_ISDB_LAYERB_SEGMENT_WIDTH",

		.cmd	= DTV_ISDB_LAYERB_SEGMENT_WIDTH,

		.set	= 0,

	},

	[DTV_ISDB_LAYERC_FEC] = {

		.name	= "DTV_ISDB_LAYERC_FEC",

		.cmd	= DTV_ISDB_LAYERC_FEC,

		.set	= 0,

	},

	[DTV_ISDB_LAYERC_MODULATION] = {

		.name	= "DTV_ISDB_LAYERC_MODULATION",

		.cmd	= DTV_ISDB_LAYERC_MODULATION,

		.set	= 0,

	},

	[DTV_ISDB_LAYERC_SEGMENT_WIDTH] = {

		.name	= "DTV_ISDB_LAYERC_SEGMENT_WIDTH",

		.cmd	= DTV_ISDB_LAYERC_SEGMENT_WIDTH,

		.set	= 0,

	},

};



void dtv_property_dump(struct dtv_property *tvp)
@@ -1154,41 +1098,6 @@ int dtv_property_process_get(struct dvb_frontend *fe, struct dtv_property *tvp, 
	case DTV_DELIVERY_SYSTEM:

		tvp->u.data = fe->dtv_property_cache.delivery_system;

		break;



	/* ISDB-T Support here */

	case DTV_ISDB_SEGMENT_IDX:

		tvp->u.data = fe->dtv_property_cache.isdb_segment_idx;

		break;

	case DTV_ISDB_SEGMENT_WIDTH:

		tvp->u.data = fe->dtv_property_cache.isdb_segment_width;

		break;

	case DTV_ISDB_LAYERA_FEC:

		tvp->u.data = fe->dtv_property_cache.isdb_layera_fec;

		break;

	case DTV_ISDB_LAYERA_MODULATION:

		tvp->u.data = fe->dtv_property_cache.isdb_layera_modulation;

		break;

	case DTV_ISDB_LAYERA_SEGMENT_WIDTH:

		tvp->u.data = fe->dtv_property_cache.isdb_layera_segment_width;

		break;

	case DTV_ISDB_LAYERB_FEC:

		tvp->u.data = fe->dtv_property_cache.isdb_layerb_fec;

		break;

	case DTV_ISDB_LAYERB_MODULATION:

		tvp->u.data = fe->dtv_property_cache.isdb_layerb_modulation;

		break;

	case DTV_ISDB_LAYERB_SEGMENT_WIDTH:

		tvp->u.data = fe->dtv_property_cache.isdb_layerb_segment_width;

		break;

	case DTV_ISDB_LAYERC_FEC:

		tvp->u.data = fe->dtv_property_cache.isdb_layerc_fec;

		break;

	case DTV_ISDB_LAYERC_MODULATION:

		tvp->u.data = fe->dtv_property_cache.isdb_layerc_modulation;

		break;

	case DTV_ISDB_LAYERC_SEGMENT_WIDTH:

		tvp->u.data = fe->dtv_property_cache.isdb_layerc_segment_width;

		break;

	case DTV_VOLTAGE:

		tvp->u.data = fe->dtv_property_cache.voltage;

		break;
@@ -1266,14 +1175,6 @@ int dtv_property_process_set(struct dvb_frontend *fe, struct dtv_property *tvp, 
	case DTV_DELIVERY_SYSTEM:

		fe->dtv_property_cache.delivery_system = tvp->u.data;

		break;



	/* ISDB-T Support here */

	case DTV_ISDB_SEGMENT_IDX:

		fe->dtv_property_cache.isdb_segment_idx = tvp->u.data;

		break;

	case DTV_ISDB_SEGMENT_WIDTH:

		fe->dtv_property_cache.isdb_segment_width = tvp->u.data;

		break;

	case DTV_VOLTAGE:

		fe->dtv_property_cache.voltage = tvp->u.data;

		r = dvb_frontend_ioctl_legacy(inode, file, FE_SET_VOLTAGE,

drivers/media/dvb/dvb-core/dvb_frontend.h

+0 −13
Original line number Diff line number Diff line
@@ -209,19 +209,6 @@ struct dtv_frontend_properties { 
	fe_rolloff_t		rolloff;



	fe_delivery_system_t	delivery_system;



	/* ISDB-T specifics */

	u32			isdb_segment_idx;

	u32			isdb_segment_width;

	fe_code_rate_t		isdb_layera_fec;

	fe_modulation_t		isdb_layera_modulation;

	u32			isdb_layera_segment_width;

	fe_code_rate_t		isdb_layerb_fec;

	fe_modulation_t		isdb_layerb_modulation;

	u32			isdb_layerb_segment_width;

	fe_code_rate_t		isdb_layerc_fec;

	fe_modulation_t		isdb_layerc_modulation;

	u32			isdb_layerc_segment_width;

};



struct dvb_frontend {

include/linux/dvb/frontend.h

+0 −30
Original line number Diff line number Diff line
@@ -280,36 +280,6 @@ typedef enum dtv_cmd_types { 


	/* New commands are always appended */

	DTV_DELIVERY_SYSTEM,



	/* ISDB */

	/* maybe a dup of DTV_ISDB_SOUND_BROADCASTING_SUBCHANNEL_ID ??? */

	DTV_ISDB_SEGMENT_IDX,

	DTV_ISDB_SEGMENT_WIDTH, /* 1, 3 or 13 ??? */



	/* the central segment can be received independently or 1/3 seg in SB-mode */

	DTV_ISDB_PARTIAL_RECEPTION,

	/* sound broadcasting is used 0 = 13segment, 1 = 1 or 3 see DTV_ISDB_PARTIAL_RECEPTION */

	DTV_ISDB_SOUND_BROADCASTING,



	/* only used in SB */

	/* determines the initial PRBS of the segment (to match with 13seg channel) */

	DTV_ISDB_SOUND_BROADCASTING_SUBCHANNEL_ID,



	DTV_ISDB_LAYERA_FEC,

	DTV_ISDB_LAYERA_MODULATION,

	DTV_ISDB_LAYERA_SEGMENT_WIDTH,

	DTV_ISDB_LAYERA_TIME_INTERLEAVER,



	DTV_ISDB_LAYERB_FEC,

	DTV_ISDB_LAYERB_MODULATION,

	DTV_ISDB_LAYERB_SEGMENT_WIDTH,

	DTV_ISDB_LAYERB_TIME_INTERLEAVING,



	DTV_ISDB_LAYERC_FEC,

	DTV_ISDB_LAYERC_MODULATION,

	DTV_ISDB_LAYERC_SEGMENT_WIDTH,

	DTV_ISDB_LAYERC_TIME_INTERLEAVING,



} dtv_cmd_types_t;



typedef enum fe_pilot {