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

Commit 490ecd63 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] dib8000: Remove the old DVBv3 struct from it and add delsys 



This driver only uses the DVBv5 struct. All it needs is to remove
the non-used params var, and to add the ISDB-T to the delivery
systems.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fe084929

drivers/media/dvb/frontends/dib8000.c

+7 −6
Original line number Diff line number Diff line
@@ -2810,7 +2810,7 @@ int dib8000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tun 
}

EXPORT_SYMBOL(dib8000_set_tune_state);



static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)

static int dib8000_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *c)

{

	struct dib8000_state *state = fe->demodulator_priv;

	u16 i, val = 0;
@@ -2824,7 +2824,7 @@ static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par 
		if (stat&FE_HAS_SYNC) {

			dprintk("TMCC lock on the slave%i", index_frontend);

			/* synchronize the cache with the other frontends */

			state->fe[index_frontend]->ops.get_frontend_legacy(state->fe[index_frontend], fep);

			state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend], c);

			for (sub_index_frontend = 0; (sub_index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[sub_index_frontend] != NULL); sub_index_frontend++) {

				if (sub_index_frontend != index_frontend) {

					state->fe[sub_index_frontend]->dtv_property_cache.isdbt_sb_mode = state->fe[index_frontend]->dtv_property_cache.isdbt_sb_mode;
@@ -2956,7 +2956,7 @@ static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par 
	return 0;

}



static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)

static int dib8000_set_frontend(struct dvb_frontend *fe)

{

	struct dib8000_state *state = fe->demodulator_priv;

	u8 nbr_pending, exit_condition, index_frontend;
@@ -3088,7 +3088,7 @@ static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par 


		dprintk("tune success on frontend%i", index_frontend_success);



		dib8000_get_frontend(fe, fep);

		dib8000_get_frontend(fe, &state->fe[0]->dtv_property_cache);

	}



	for (index_frontend = 0, ret = 0; (ret >= 0) && (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++)
@@ -3461,6 +3461,7 @@ int dib8000_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff) 
EXPORT_SYMBOL(dib8000_pid_filter);



static const struct dvb_frontend_ops dib8000_ops = {

	.delsys = { SYS_ISDBT },

	.info = {

		 .name = "DiBcom 8000 ISDB-T",

		 .type = FE_OFDM,
@@ -3479,9 +3480,9 @@ static const struct dvb_frontend_ops dib8000_ops = { 
	.init = dib8000_wakeup,

	.sleep = dib8000_sleep,



	.set_frontend_legacy = dib8000_set_frontend,

	.set_frontend = dib8000_set_frontend,

	.get_tune_settings = dib8000_fe_get_tune_settings,

	.get_frontend_legacy = dib8000_get_frontend,

	.get_frontend = dib8000_get_frontend,



	.read_status = dib8000_read_status,

	.read_ber = dib8000_read_ber,