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

Commit 356484ca authored by Olli Salonen's avatar Olli Salonen Committed by Mauro Carvalho Chehab
Browse files

[media] dw2102: resync fifo when demod locks 



If the streaming_ctrl is called to enable TS before demod has locked
the TS will be empty. Copied the solution from the dvbsky driver for the
TechnoTrend S2-4600 device: when the state changes from unlock to
lock, call su3000_streaming_ctrl again.

Signed-off-by: default avatarOlli Salonen <olli.salonen@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c636bd0b

drivers/media/usb/dvb-usb/dw2102.c

+28 −0
Original line number Diff line number Diff line
@@ -117,8 +117,13 @@ 


struct dw2102_state {

	u8 initialized;

	u8 last_lock;

	struct i2c_client *i2c_client_tuner;



	/* fe hook functions*/

	int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);

	int (*fe_read_status)(struct dvb_frontend *fe,

		fe_status_t *status);

};



/* debug */
@@ -999,6 +1004,23 @@ static void dw210x_led_ctrl(struct dvb_frontend *fe, int offon) 
	i2c_transfer(&udev_adap->dev->i2c_adap, &msg, 1);

}



static int tt_s2_4600_read_status(struct dvb_frontend *fe, fe_status_t *status)

{

	struct dvb_usb_adapter *d =

		(struct dvb_usb_adapter *)(fe->dvb->priv);

	struct dw2102_state *st = (struct dw2102_state *)d->dev->priv;

	int ret;



	ret = st->fe_read_status(fe, status);



	/* resync slave fifo when signal change from unlock to lock */

	if ((*status & FE_HAS_LOCK) && (!st->last_lock))

		su3000_streaming_ctrl(d, 1);



	st->last_lock = (*status & FE_HAS_LOCK) ? 1 : 0;

	return ret;

}



static struct stv0299_config sharp_z0194a_config = {

	.demod_address = 0x68,

	.inittab = sharp_z0194a_inittab,
@@ -1551,6 +1573,12 @@ static int tt_s2_4600_frontend_attach(struct dvb_usb_adapter *adap) 


	state->i2c_client_tuner = client;



	/* hook fe: need to resync the slave fifo when signal locks */

	state->fe_read_status = adap->fe_adap[0].fe->ops.read_status;

	adap->fe_adap[0].fe->ops.read_status = tt_s2_4600_read_status;



	state->last_lock = 0;



	return 0;

}