lmedm04: Increase Interupt due time to 200 msec.
Subsystems (2)
Malcolm Priestley
maintainerPATCH 1/5 lmedm04: Increase Interupt due time to 200 msec.
Ocassionally the device fails to report back an interrupt urb status which results in false no lock trigger on the RS2000 demodulator.
Increase time from 60 msecs to 200 msecs.
--- drivers/media/usb/dvb-usb-v2/lmedm04.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/media/usb/dvb-usb-v2/lmedm04.c +4 -3
@@ -344,9 +344,10 @@ static void lme2510_int_response(struct urb *lme_urb)usb_submit_urb (lme_urb,GFP_ATOMIC ); -/* interrupt urb is due every 48 msecs while streaming -* add 12msecs for system lag */ - st->int_urb_due = jiffies +msecs_to_jiffies (60 ); +/* Interrupt urb is due every 48 msecs while streaming the buffer +* stores up to 4 periods if missed. Allow 200 msec for next interrupt. +*/ + st->int_urb_due = jiffies +msecs_to_jiffies (200 ); }static int lme2510_int_read (struct dvb_usb_adapter *adap)
Signature · 1 line
2.1.0
Malcolm Priestley
maintainerPATCH 2/5 lmedm04: Fix usb_submit_urb BOGUS urb xfer, pipe 1 != type 3 in interrupt urb
A quirk of some older firmwares that report endpoint pipe type as PIPE_BULK but the endpoint otheriwse functions as interrupt.
Check if usb_endpoint_type is USB_ENDPOINT_XFER_BULK and set as usb_rcvbulkpipe.
--- drivers/media/usb/dvb-usb-v2/lmedm04.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/media/usb/dvb-usb-v2/lmedm04.c +7 -0
@@ -354,6 +354,7 @@ static int lme2510_int_read(struct dvb_usb_adapter *adap) {struct dvb_usb_device *d =adap_to_d (adap);struct lme2510_state *lme_int =adap_to_priv (adap); +struct usb_host_endpoint *ep; lme_int->lme_urb =usb_alloc_urb (0 ,GFP_ATOMIC );
@@ -375,6 +376,12 @@ static int lme2510_int_read(struct dvb_usb_adapter *adap) adap, 8); +/* Quirk of pipe reporting PIPE_BULK but behaves as interrupt */ + ep =usb_pipe_endpoint (d->udev, lme_int->lme_urb->pipe); + +if (usb_endpoint_type (&ep->desc) ==USB_ENDPOINT_XFER_BULK ) + lme_int->lme_urb->pipe =usb_rcvbulkpipe (d->udev,0xa ), + lme_int->lme_urb->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ;usb_submit_urb (lme_int->lme_urb,GFP_ATOMIC );
Signature · 1 line
2.1.0
Malcolm Priestley
maintainerPATCH 3/5 lmedm04: create frontend callbacks for signal/snr/ber/ucblocks
In reply to Malcolm PriestleyCreate call backs dm04_read_signal_strength, dm04_read_snr and move dm04_read_ber and dm04_read_ucblocks for all frontends
Removing the I2C filtering from lme2510_msg and the old rs2000 callbacks.
--- drivers/media/usb/dvb-usb-v2/lmedm04.c | 93 ++++++++++++---------------------- 1 file changed, 33 insertions(+), 60 deletions(-)
drivers/media/usb/dvb-usb-v2/lmedm04.c +33 -60
@@ -515,21 +515,6 @@ static int lme2510_msg(struct dvb_usb_device *d, rbuf[0 ] =0x55 ; rbuf[1 ] = st->signal_lock;break ; -case 0x43 : - rbuf[0 ] =0x55 ; - rbuf[1 ] = st->signal_level; -break ; -case 0x1c : - rbuf[0 ] =0x55 ; - rbuf[1 ] = st->signal_sn; -break ; -case 0x15 : -case 0x16 : -case 0x17 : -case 0x18 : - rbuf[0 ] =0x55 ; - rbuf[1 ] =0x00 ; -break ;default :lme2510_usb_talk (d, wbuf, wlen, rbuf, rlen); st->i2c_talk_onoff =1 ;
@@ -538,25 +523,10 @@ static int lme2510_msg(struct dvb_usb_device *d,break ;case TUNER_S7395 :switch (wbuf[3 ]) { -case 0x10 : - rbuf[0 ] =0x55 ; - rbuf[1 ] = (st->signal_level &0x80 ) - ?0 : (st->signal_level *2 ); -break ; -case 0x2d : - rbuf[0 ] =0x55 ; - rbuf[1 ] = st->signal_sn; -break ;case 0x24 : rbuf[0 ] =0x55 ; rbuf[1 ] = st->signal_lock;break ; -case 0x2e : -case 0x26 : -case 0x27 : - rbuf[0 ] =0x55 ; - rbuf[1 ] =0x00 ; -break ;default :lme2510_usb_talk (d, wbuf, wlen, rbuf, rlen); st->i2c_talk_onoff =1 ;
@@ -565,26 +535,10 @@ static int lme2510_msg(struct dvb_usb_device *d,break ;case TUNER_S0194 :switch (wbuf[3 ]) { -case 0x18 : - rbuf[0 ] =0x55 ; - rbuf[1 ] = (st->signal_level &0x80 ) - ?0 : (st->signal_level *2 ); -break ; -case 0x24 : - rbuf[0 ] =0x55 ; - rbuf[1 ] = st->signal_sn; -break ;case 0x1b : rbuf[0 ] =0x55 ; rbuf[1 ] = st->signal_lock;break ; -case 0x19 : -case 0x25 : -case 0x1e : -case 0x1d : - rbuf[0 ] =0x55 ; - rbuf[1 ] =0x00 ; -break ;default :lme2510_usb_talk (d, wbuf, wlen, rbuf, rlen); st->i2c_talk_onoff =1 ;
@@ -1006,21 +960,44 @@ static int dm04_lme2510_set_voltage(struct dvb_frontend *fe,return (ret <0 ) ? -ENODEV :0 ; } -static int dm04_rs2000_read_signal_strength (struct dvb_frontend *fe, -u16 *strength) +static int dm04_read_signal_strength (struct dvb_frontend *fe,u16 *strength) {struct lme2510_state *st =fe_to_priv (fe); - *strength = (u16)((u32 )st->signal_level *0xffff /0xff ); +switch (st->tuner_config) { +case TUNER_LG : + *strength =0xff - st->signal_level; + *strength |= *strength <<8 ; +break ; +/* fall through */ +case TUNER_S7395 : +case TUNER_S0194 : + *strength =0xffff - (((st->signal_level *2 ) <<8 ) *5 /4 ); +break ; +case TUNER_RS2000 : + *strength = (u16)((u32 )st->signal_level *0xffff /0xff ); + }return 0 ; } -static int dm04_rs2000_read_snr (struct dvb_frontend *fe,u16 *snr) +static int dm04_read_snr (struct dvb_frontend *fe,u16 *snr) {struct lme2510_state *st =fe_to_priv (fe); - *snr = (u16)((u32 )st->signal_sn *0xffff /0x7f ); +switch (st->tuner_config) { +case TUNER_LG : + *snr =0xff - st->signal_sn; + *snr |= *snr <<8 ; +break ; +/* fall through */ +case TUNER_S7395 : +case TUNER_S0194 : + *snr = (u16)((0xff - st->signal_sn -0xa1 ) *3 ) <<8 ; +break ; +case TUNER_RS2000 : + *snr = (u16)((u32 )st->signal_sn *0xffff /0x7f ); + }return 0 ; }
@@ -1127,15 +1104,6 @@ static int dm04_lme2510_frontend_attach(struct dvb_usb_adapter *adap) st->tuner_config =TUNER_RS2000 ; st->fe_set_voltage = adap->fe[0 ]->ops.set_voltage; - - adap->fe[0 ]->ops.read_signal_strength = - dm04_rs2000_read_signal_strength; - adap->fe[0 ]->ops.read_snr = - dm04_rs2000_read_snr; - adap->fe[0 ]->ops.read_ber = - dm04_read_ber; - adap->fe[0 ]->ops.read_ucblocks = - dm04_read_ucblocks; }break ; }
@@ -1154,7 +1122,12 @@ static int dm04_lme2510_frontend_attach(struct dvb_usb_adapter *adap)return -ENODEV ; } + adap->fe[0 ]->ops.read_signal_strength = dm04_read_signal_strength; + adap->fe[0 ]->ops.read_snr = dm04_read_snr; + adap->fe[0 ]->ops.read_ber = dm04_read_ber; + adap->fe[0 ]->ops.read_ucblocks = dm04_read_ucblocks; adap->fe[0 ]->ops.set_voltage = dm04_lme2510_set_voltage; + ret =lme_name (adap);return ret; }
Signature · 1 line
2.1.0
Malcolm Priestley
maintainerPATCH 4/5 lmedm04: Create frontend call back for read status.
In reply to Malcolm PriestleyCreate dm04_read_status to check lock through either interrupt values or directly by the call back.
When the device is not streaming the frontends original call back is used. When streaming has started it turns off I2C messaging by setting st->i2c_talk_onoff to zero. I2C can only be turn on again by one of the other allowed frontend calls.
All old code is removed from lme2510_msg and this function only needs to set st->i2c_talk_onoff to 1.
The lock status is saved and when the frondend is locked is maintained by lme2510_int_response who will now just kill the lock.
The call back for rs2000 tuner is nologer required.
All frontend types have been tested.
--- drivers/media/usb/dvb-usb-v2/lmedm04.c | 205 ++++++++++----------------------- 1 file changed, 60 insertions(+), 145 deletions(-)
drivers/media/usb/dvb-usb-v2/lmedm04.c +60 -145
@@ -126,9 +126,9 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);struct lme2510_state {unsigned long int_urb_due; +fe_status_t lock_status;u8 id;u8 tuner_config; -u8 signal_lock;u8 signal_level;u8 signal_sn;u8 time_key;
@@ -143,6 +143,8 @@ struct lme2510_state {void *buffer;struct urb *lme_urb;void *usb_buffer; +/* Frontend original calls */ +int (*fe_read_status)(struct dvb_frontend *,fe_status_t *);int (*fe_set_voltage)(struct dvb_frontend *,fe_sec_voltage_t );u8 dvb_usb_lme2510_firmware; };
@@ -258,6 +260,7 @@ static void lme2510_int_response(struct urb *lme_urb)static u8 *ibuf, *rbuf;int i =0 , offset;u32 key; +u8 signal_lock =0 ;switch (lme_urb->status) {case 0 :
@@ -298,8 +301,7 @@ static void lme2510_int_response(struct urb *lme_urb)case 0xbb :switch (st->tuner_config) {case TUNER_LG : -if (ibuf[2 ] >0 ) - st->signal_lock = ibuf[2 ]; + signal_lock = ibuf[2 ] &BIT (5 ); st->signal_level = ibuf[4 ]; st->signal_sn = ibuf[3 ]; st->time_key = ibuf[7 ];
@@ -308,29 +310,29 @@ static void lme2510_int_response(struct urb *lme_urb)case TUNER_S0194 :/* Tweak for earlier firmware*/ if (ibuf[1 ] ==0x03 ) { -if (ibuf[2 ] >1 ) - st->signal_lock = ibuf[2 ]; + signal_lock = ibuf[2 ] &BIT (4 ); st->signal_level = ibuf[3 ]; st->signal_sn = ibuf[4 ]; }else { st->signal_level = ibuf[4 ]; st->signal_sn = ibuf[5 ]; - st->signal_lock = - (st->signal_lock &0xf7 ) + - ((ibuf[2 ] &0x01 ) <<0x03 ); }break ;case TUNER_RS2000 : -if (ibuf[2 ] &0x1 ) - st->signal_lock =0xff ; -else - st->signal_lock =0x00 ; + signal_lock = ibuf[2 ] &0xee ; st->signal_level = ibuf[5 ]; st->signal_sn = ibuf[4 ]; st->time_key = ibuf[7 ];default :break ; } + +/* Interrupt will also throw just BIT 0 as lock */ + signal_lock |= ibuf[2 ] &BIT (0 ); + +if (!signal_lock) + st->lock_status &= ~FE_HAS_LOCK ; +debug_data_snipet (5 ,"INT Remote data snipet in" , ibuf);break ;case 0xcc :
@@ -457,124 +459,13 @@ static int lme2510_return_status(struct dvb_usb_device *d)static int lme2510_msg (struct dvb_usb_device *d,u8 *wbuf,int wlen,u8 *rbuf,int rlen) { -int ret =0 ;struct lme2510_state *st = d->priv; -if (st->i2c_talk_onoff ==1 ) { - - ret =lme2510_usb_talk (d, wbuf, wlen, rbuf, rlen); - -switch (st->tuner_config) { -case TUNER_LG : -if (wbuf[2 ] ==0x1c ) { -if (wbuf[3 ] ==0x0e ) { - st->signal_lock = rbuf[1 ]; -if ((st->stream_on &1 ) && - (st->signal_lock &0x10 )) { -lme2510_stream_restart (d); - st->i2c_talk_onoff =0 ; - } -msleep (80 ); - } - } -break ; -case TUNER_S7395 : -if (wbuf[2 ] ==0xd0 ) { -if (wbuf[3 ] ==0x24 ) { - st->signal_lock = rbuf[1 ]; -if ((st->stream_on &1 ) && - (st->signal_lock &0x8 )) { -lme2510_stream_restart (d); - st->i2c_talk_onoff =0 ; - } - } - } -break ; -case TUNER_S0194 : -if (wbuf[2 ] ==0xd0 ) { -if (wbuf[3 ] ==0x1b ) { - st->signal_lock = rbuf[1 ]; -if ((st->stream_on &1 ) && - (st->signal_lock &0x8 )) { -lme2510_stream_restart (d); - st->i2c_talk_onoff =0 ; - } - } - } -break ; -case TUNER_RS2000 : -default : -break ; - } - }else { -/* TODO rewrite this section */ -switch (st->tuner_config) { -case TUNER_LG : -switch (wbuf[3 ]) { -case 0x0e : - rbuf[0 ] =0x55 ; - rbuf[1 ] = st->signal_lock; -break ; -default : -lme2510_usb_talk (d, wbuf, wlen, rbuf, rlen); - st->i2c_talk_onoff =1 ; -break ; - } -break ; -case TUNER_S7395 : -switch (wbuf[3 ]) { -case 0x24 : - rbuf[0 ] =0x55 ; - rbuf[1 ] = st->signal_lock; -break ; -default : -lme2510_usb_talk (d, wbuf, wlen, rbuf, rlen); - st->i2c_talk_onoff =1 ; -break ; - } -break ; -case TUNER_S0194 : -switch (wbuf[3 ]) { -case 0x1b : - rbuf[0 ] =0x55 ; - rbuf[1 ] = st->signal_lock; -break ; -default : -lme2510_usb_talk (d, wbuf, wlen, rbuf, rlen); - st->i2c_talk_onoff =1 ; -break ; - } -break ; -case TUNER_RS2000 : -switch (wbuf[3 ]) { -case 0x8c : - rbuf[0 ] =0x55 ; - rbuf[1 ] = st->signal_lock; - -/* If int_urb_due overdue -* set rbuf[1] to 0 to clear lock */ -if (time_after (jiffies, st->int_urb_due)) - rbuf[1 ] =0 ; - -break ; -default : -lme2510_usb_talk (d, wbuf, wlen, rbuf, rlen); - st->i2c_talk_onoff =1 ; -break ; - } -default : -break ; - } - -deb_info (4 ,"I2C From Interrupt Message out(%02x) in(%02x)" , - wbuf[3 ], rbuf[1 ]); - - } + st->i2c_talk_onoff =1 ; -return ret; +return lme2510_usb_talk (d, wbuf, wlen, rbuf, rlen); } -static int lme2510_i2c_xfer (struct i2c_adapter *adap,struct i2c_msg msg[],int num) {
@@ -897,26 +788,8 @@ static struct stv0299_config sharp_z0194_config = { .set_symbol_rate = sharp_z0194a_set_symbol_rate, }; -static int dm04_rs2000_set_ts_param (struct dvb_frontend *fe, -int caller) -{ -struct dvb_usb_adapter *adap =fe_to_adap (fe); -struct dvb_usb_device *d =adap_to_d (adap); -struct lme2510_state *st = d->priv; - -mutex_lock (&d->i2c_mutex); -if ((st->i2c_talk_onoff ==1 ) && (st->stream_on &1 )) { - st->i2c_talk_onoff =0 ; -lme2510_stream_restart (d); - } -mutex_unlock (&d->i2c_mutex); - -return 0 ; -} -static struct m88rs2000_config m88rs2000_config = { - .demod_addr =0x68 , - .set_ts_params = dm04_rs2000_set_ts_param, + .demod_addr =0x68 };static struct ts2020_config ts2020_config = {
@@ -960,6 +833,46 @@ static int dm04_lme2510_set_voltage(struct dvb_frontend *fe,return (ret <0 ) ? -ENODEV :0 ; } +static int dm04_read_status (struct dvb_frontend *fe,fe_status_t *status) +{ +struct dvb_usb_device *d =fe_to_d (fe); +struct lme2510_state *st = d->priv; +int ret =0 ; + +if (st->i2c_talk_onoff) { +if (st->fe_read_status) { + ret = st->fe_read_status (fe, status); +if (ret <0 ) +return ret; + } + + st->lock_status = *status; + +if (*status &FE_HAS_LOCK && st->stream_on) { +mutex_lock (&d->i2c_mutex); + + st->i2c_talk_onoff =0 ; + ret =lme2510_stream_restart (d); + +mutex_unlock (&d->i2c_mutex); + } + +return ret; + } + +/* Timeout of interrupt reached on RS2000 */ +if (st->tuner_config ==TUNER_RS2000 && +time_after (jiffies, st->int_urb_due)) + st->lock_status &= ~FE_HAS_LOCK ; + + *status = st->lock_status; + +if (!(*status &FE_HAS_LOCK )) + st->i2c_talk_onoff =1 ; + +return ret; +} +static int dm04_read_signal_strength (struct dvb_frontend *fe,u16 *strength) {struct lme2510_state *st =fe_to_priv (fe);
@@ -1122,6 +1035,9 @@ static int dm04_lme2510_frontend_attach(struct dvb_usb_adapter *adap)return -ENODEV ; } + st->fe_read_status = adap->fe[0 ]->ops.read_status; + + adap->fe[0 ]->ops.read_status = dm04_read_status; adap->fe[0 ]->ops.read_signal_strength = dm04_read_signal_strength; adap->fe[0 ]->ops.read_snr = dm04_read_snr; adap->fe[0 ]->ops.read_ber = dm04_read_ber;
@@ -1269,7 +1185,6 @@ static void *lme2510_exit_int(struct dvb_usb_device *d)if (st->usb_buffer !=NULL ) { st->i2c_talk_onoff =1 ; - st->signal_lock =0 ; st->signal_level =0 ; st->signal_sn =0 ; buffer = st->usb_buffer;
Signature · 1 line
2.1.0
Malcolm Priestley
maintainerPATCH 5/5 lmedm04: add read snr, signal strength and ber call backs
In reply to Malcolm PriestleyThis allows calling the original functions providing the streaming is off.
--- drivers/media/usb/dvb-usb-v2/lmedm04.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/media/usb/dvb-usb-v2/lmedm04.c +24 -0
@@ -145,6 +145,10 @@ struct lme2510_state {void *usb_buffer;/* Frontend original calls */ int (*fe_read_status)(struct dvb_frontend *,fe_status_t *); +int (*fe_read_signal_strength)(struct dvb_frontend *,u16 *); +int (*fe_read_snr)(struct dvb_frontend *,u16 *); +int (*fe_read_ber)(struct dvb_frontend *,u32 *); +int (*fe_read_ucblocks)(struct dvb_frontend *,u32 *);int (*fe_set_voltage)(struct dvb_frontend *,fe_sec_voltage_t );u8 dvb_usb_lme2510_firmware; };
@@ -877,6 +881,9 @@ static int dm04_read_signal_strength(struct dvb_frontend *fe, u16 *strength) {struct lme2510_state *st =fe_to_priv (fe); +if (st->fe_read_signal_strength && !st->stream_on) +return st->fe_read_signal_strength (fe, strength); +switch (st->tuner_config) {case TUNER_LG : *strength =0xff - st->signal_level;
@@ -898,6 +905,9 @@ static int dm04_read_snr(struct dvb_frontend *fe, u16 *snr) {struct lme2510_state *st =fe_to_priv (fe); +if (st->fe_read_snr && !st->stream_on) +return st->fe_read_snr (fe, snr); +switch (st->tuner_config) {case TUNER_LG : *snr =0xff - st->signal_sn;
@@ -917,6 +927,11 @@ static int dm04_read_snr(struct dvb_frontend *fe, u16 *snr)static int dm04_read_ber (struct dvb_frontend *fe,u32 *ber) { +struct lme2510_state *st =fe_to_priv (fe); + +if (st->fe_read_ber && !st->stream_on) +return st->fe_read_ber (fe, ber); + *ber =0 ;return 0 ;
@@ -924,6 +939,11 @@ static int dm04_read_ber(struct dvb_frontend *fe, u32 *ber)static int dm04_read_ucblocks (struct dvb_frontend *fe,u32 *ucblocks) { +struct lme2510_state *st =fe_to_priv (fe); + +if (st->fe_read_ucblocks && !st->stream_on) +return st->fe_read_ucblocks (fe, ucblocks); + *ucblocks =0 ;return 0 ;
@@ -1036,6 +1056,10 @@ static int dm04_lme2510_frontend_attach(struct dvb_usb_adapter *adap) } st->fe_read_status = adap->fe[0 ]->ops.read_status; + st->fe_read_signal_strength = adap->fe[0 ]->ops.read_signal_strength; + st->fe_read_snr = adap->fe[0 ]->ops.read_snr; + st->fe_read_ber = adap->fe[0 ]->ops.read_ber; + st->fe_read_ucblocks = adap->fe[0 ]->ops.read_ucblocks; adap->fe[0 ]->ops.read_status = dm04_read_status; adap->fe[0 ]->ops.read_signal_strength = dm04_read_signal_strength;
Signature · 1 line
2.1.0
Re: [PATCH 5/5] lmedm04: add read snr, signal strength and ber call backs
Em Fri, 2 Jan 2015 13:56:31 +0000
Malcolm Priestley <[email protected]> escreveu:
Quoted 1 line
This allows calling the original functions providing the streaming is off.
Malcolm,
I'm applying this patch series, as the driver has already some support for the legacy DVBv3 stats, but please port it to use DVBv5.
Thanks,
Mauro
Quoted 76 lines
Signed-off-by Malcolm Priestley <[email protected]>--- drivers/media/usb/dvb-usb-v2/lmedm04.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)drivers/media/usb/dvb-usb-v2/lmedm04.c +24
-0@@ -145,6 +145,10 @@ struct lme2510_state {void *usb_buffer;/* Frontend original calls */ int (*fe_read_status)(struct dvb_frontend *,fe_status_t *); +int (*fe_read_signal_strength)(struct dvb_frontend *,u16 *); +int (*fe_read_snr)(struct dvb_frontend *,u16 *); +int (*fe_read_ber)(struct dvb_frontend *,u32 *); +int (*fe_read_ucblocks)(struct dvb_frontend *,u32 *);int (*fe_set_voltage)(struct dvb_frontend *,fe_sec_voltage_t );u8 dvb_usb_lme2510_firmware; };@@ -877,6 +881,9 @@ static int dm04_read_signal_strength(struct dvb_frontend *fe, u16 *strength) {struct lme2510_state *st =fe_to_priv (fe); +if (st->fe_read_signal_strength && !st->stream_on) +return st->fe_read_signal_strength (fe, strength); +switch (st->tuner_config) {case TUNER_LG : *strength =0xff - st->signal_level;@@ -898,6 +905,9 @@ static int dm04_read_snr(struct dvb_frontend *fe, u16 *snr) {struct lme2510_state *st =fe_to_priv (fe); +if (st->fe_read_snr && !st->stream_on) +return st->fe_read_snr (fe, snr); +switch (st->tuner_config) {case TUNER_LG : *snr =0xff - st->signal_sn;@@ -917,6 +927,11 @@ static int dm04_read_snr(struct dvb_frontend *fe, u16 *snr)static int dm04_read_ber (struct dvb_frontend *fe,u32 *ber) { +struct lme2510_state *st =fe_to_priv (fe); + +if (st->fe_read_ber && !st->stream_on) +return st->fe_read_ber (fe, ber); + *ber =0 ;return 0 ;@@ -924,6 +939,11 @@ static int dm04_read_ber(struct dvb_frontend *fe, u32 *ber)static int dm04_read_ucblocks (struct dvb_frontend *fe,u32 *ucblocks) { +struct lme2510_state *st =fe_to_priv (fe); + +if (st->fe_read_ucblocks && !st->stream_on) +return st->fe_read_ucblocks (fe, ucblocks); + *ucblocks =0 ;return 0 ;@@ -1036,6 +1056,10 @@ static int dm04_lme2510_frontend_attach(struct dvb_usb_adapter *adap) } st->fe_read_status = adap->fe[0 ]->ops.read_status; + st->fe_read_signal_strength = adap->fe[0 ]->ops.read_signal_strength; + st->fe_read_snr = adap->fe[0 ]->ops.read_snr; + st->fe_read_ber = adap->fe[0 ]->ops.read_ber; + st->fe_read_ucblocks = adap->fe[0 ]->ops.read_ucblocks; adap->fe[0 ]->ops.read_status = dm04_read_status; adap->fe[0 ]->ops.read_signal_strength = dm04_read_signal_strength;
Malcolm Priestley
maintainerRe: [PATCH 5/5] lmedm04: add read snr, signal strength and ber call backs
Quoted 9 lines · Mauro Carvalho Chehab
Em Fri, 2 Jan 2015 13:56:31 +0000
Malcolm Priestley <[email protected]> escreveu:Quoted 1 line
This allows calling the original functions providing the streaming is off.
Malcolm,
I'm applying this patch series, as the driver has already some support for the legacy DVBv3 stats, but please port it to use DVBv5.
Hi Mauro,
I am not sure what you mean by this?
Are there any examples?
Regards
Malcolm
Quoted 80 lines
Thanks,
MauroQuoted 76 lines
Signed-off-by Malcolm Priestley <[email protected]>--- drivers/media/usb/dvb-usb-v2/lmedm04.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)drivers/media/usb/dvb-usb-v2/lmedm04.c +24
-0@@ -145,6 +145,10 @@ struct lme2510_state {void *usb_buffer;/* Frontend original calls */ int (*fe_read_status)(struct dvb_frontend *,fe_status_t *); +int (*fe_read_signal_strength)(struct dvb_frontend *,u16 *); +int (*fe_read_snr)(struct dvb_frontend *,u16 *); +int (*fe_read_ber)(struct dvb_frontend *,u32 *); +int (*fe_read_ucblocks)(struct dvb_frontend *,u32 *);int (*fe_set_voltage)(struct dvb_frontend *,fe_sec_voltage_t );u8 dvb_usb_lme2510_firmware; };@@ -877,6 +881,9 @@ static int dm04_read_signal_strength(struct dvb_frontend *fe, u16 *strength) {struct lme2510_state *st =fe_to_priv (fe); +if (st->fe_read_signal_strength && !st->stream_on) +return st->fe_read_signal_strength (fe, strength); +switch (st->tuner_config) {case TUNER_LG : *strength =0xff - st->signal_level;@@ -898,6 +905,9 @@ static int dm04_read_snr(struct dvb_frontend *fe, u16 *snr) {struct lme2510_state *st =fe_to_priv (fe); +if (st->fe_read_snr && !st->stream_on) +return st->fe_read_snr (fe, snr); +switch (st->tuner_config) {case TUNER_LG : *snr =0xff - st->signal_sn;@@ -917,6 +927,11 @@ static int dm04_read_snr(struct dvb_frontend *fe, u16 *snr)static int dm04_read_ber (struct dvb_frontend *fe,u32 *ber) { +struct lme2510_state *st =fe_to_priv (fe); + +if (st->fe_read_ber && !st->stream_on) +return st->fe_read_ber (fe, ber); + *ber =0 ;return 0 ;@@ -924,6 +939,11 @@ static int dm04_read_ber(struct dvb_frontend *fe, u32 *ber)static int dm04_read_ucblocks (struct dvb_frontend *fe,u32 *ucblocks) { +struct lme2510_state *st =fe_to_priv (fe); + +if (st->fe_read_ucblocks && !st->stream_on) +return st->fe_read_ucblocks (fe, ucblocks); + *ucblocks =0 ;return 0 ;@@ -1036,6 +1056,10 @@ static int dm04_lme2510_frontend_attach(struct dvb_usb_adapter *adap) } st->fe_read_status = adap->fe[0 ]->ops.read_status; + st->fe_read_signal_strength = adap->fe[0 ]->ops.read_signal_strength; + st->fe_read_snr = adap->fe[0 ]->ops.read_snr; + st->fe_read_ber = adap->fe[0 ]->ops.read_ber; + st->fe_read_ucblocks = adap->fe[0 ]->ops.read_ucblocks; adap->fe[0 ]->ops.read_status = dm04_read_status; adap->fe[0 ]->ops.read_signal_strength = dm04_read_signal_strength;
Malcolm Priestley
maintainerRe: [PATCH 5/5] lmedm04: add read snr, signal strength and ber call backs
Quoted 11 lines · Malcolm Priestley
Quoted 8 lines · Mauro Carvalho Chehab
Em Fri, 2 Jan 2015 13:56:31 +0000
Malcolm Priestley <[email protected]> escreveu:Quoted 2 lines
This allows calling the original functions providing the streaming is off.
Malcolm,
Quoted 8 lines
Quoted 3 lines
I'm applying this patch series, as the driver has already some support for
the legacy DVBv3 stats, but please port it to use DVBv5.Hi Mauro,
I am not sure what you mean by this?
Are there any examples?
Sorry, Yes I see how, will do.
Quoted 95 lines
Regards
Malcolm
Quoted 87 lines
Thanks,
MauroQuoted 83 lines
Signed-off-by Malcolm Priestley <[email protected]>--- drivers/media/usb/dvb-usb-v2/lmedm04.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)drivers/media/usb/dvb-usb-v2/lmedm04.c +7
-0@@ -145,6 +145,10 @@ struct lme2510_state {void *usb_buffer;/* Frontend original calls */ int (*fe_read_status)(struct dvb_frontend *,fe_status_t *); +int (*fe_read_signal_strength)(struct dvb_frontend *,u16 *); +int (*fe_read_snr)(struct dvb_frontend *,u16 *); +int (*fe_read_ber)(struct dvb_frontend *,u32 *); +int (*fe_read_ucblocks)(struct dvb_frontend *,u32 *);int (*fe_set_voltage)(struct dvb_frontend *,fe_sec_voltage_t );u8 dvb_usb_lme2510_firmware; };@@ -877,6 +881,9 @@ static int dm04_read_signal_strength(struct dvb_frontend *fe, u16 *strength) {struct lme2510_state *st =fe_to_priv (fe); +if (st->fe_read_signal_strength && !st->stream_on) +return st->fe_read_signal_strength (fe, strength); +switch (st->tuner_config) {case TUNER_LG :*strength = 0xff - st->signal_level;drivers/media/usb/dvb-usb-v2/lmedm04.c +3
-0@@ -898,6 +905,9 @@ static int dm04_read_snr(struct dvb_frontend *fe, u16 *snr) {struct lme2510_state *st =fe_to_priv (fe); +if (st->fe_read_snr && !st->stream_on) +return st->fe_read_snr (fe, snr); +switch (st->tuner_config) {case TUNER_LG :*snr = 0xff - st->signal_sn;drivers/media/usb/dvb-usb-v2/lmedm04.c +5
-0@@ -917,6 +927,11 @@ static int dm04_read_snr(struct dvb_frontend *fe, u16 *snr)static int dm04_read_ber (struct dvb_frontend *fe,u32 *ber) { +struct lme2510_state *st =fe_to_priv (fe); + +if (st->fe_read_ber && !st->stream_on) +return st->fe_read_ber (fe, ber); + *ber =0 ;return 0;drivers/media/usb/dvb-usb-v2/lmedm04.c +5
-0@@ -924,6 +939,11 @@ static int dm04_read_ber(struct dvb_frontend *fe, u32 *ber)static int dm04_read_ucblocks (struct dvb_frontend *fe,u32 *ucblocks) { +struct lme2510_state *st =fe_to_priv (fe); + +if (st->fe_read_ucblocks && !st->stream_on) +return st->fe_read_ucblocks (fe, ucblocks); + *ucblocks =0 ;return 0;drivers/media/usb/dvb-usb-v2/lmedm04.c +4
-0@@ -1036,6 +1056,10 @@ static int dm04_lme2510_frontend_attach(struct dvb_usb_adapter *adap) } st->fe_read_status = adap->fe[0 ]->ops.read_status; + st->fe_read_signal_strength = adap->fe[0 ]->ops.read_signal_strength; + st->fe_read_snr = adap->fe[0 ]->ops.read_snr; + st->fe_read_ber = adap->fe[0 ]->ops.read_ber; + st->fe_read_ucblocks = adap->fe[0 ]->ops.read_ucblocks;adap->fe[0]->ops.read_status = dm04_read_status; adap->fe[0]->ops.read_signal_strength = dm04_read_signal_strength;
Re: [PATCH 5/5] lmedm04: add read snr, signal strength and ber call backs
In reply to Malcolm PriestleyEm Tue, 03 Feb 2015 19:31:16 +0000
Malcolm Priestley <[email protected]> escreveu:
Quoted 8 lines · Mauro Carvalho Chehab
Quoted 5 lines
Em Fri, 2 Jan 2015 13:56:31 +0000
Malcolm Priestley <[email protected]> escreveu:Quoted 1 line
This allows calling the original functions providing the streaming is off.
Quoted 7 lines
Quoted 4 lines
Malcolm,
I'm applying this patch series, as the driver has already some support for the legacy DVBv3 stats, but please port it to use DVBv5.
Hi Mauro,
I am not sure what you mean by this?
The DVB API version 3 has some issues with stats. The main one is that they don't provide any glue to userspace about what scale they use. Due to that, we've added a new API at DVB. We're gradually adding support for that on the already existing drivers.
Quoted 1 line
Are there any examples?
Yes. You can see, for example:
$ git lg drivers/media/dvb-frontends/ |grep stats 906aaf5a195b [media] dvb:tc90522: fix stats report 1d0ceae4a19d [media] af9033: wrap DVBv3 UCB to DVBv5 UCB stats 041ad449683b [media] dib7000p: Add DVBv5 stats support d591590e1b5b [media] drx-j: enable DVBv5 stats 6983257813dc [media] drx-j: properly handle bit counts on stats 03fdfbfd3b59 [media] drx-j: Prepare to use DVBv5 stats 704f01bbc7e4 [media] dib8000: be sure that stats are available before reading them 7a9d85d5559f [media] dib8000: Fix UCB measure with DVBv5 stats 6ef06e78c74c [media] dib8000: add DVBv5 stats 8f3741e02831 [media] drxk: Add pre/post BER and PER/UCB stats 8b8e444a2711 [media] mb86a20s: Don't reset strength with the other stats 15b1c5a068e7 [media] mb86a20s: provide CNR stats before FE_HAS_SYNC
or:
$ git lg drivers/media/dvb-frontends/ |grep DVBv5 25ef9f554713 [media] rtl2832: implement DVBv5 signal strength statistics 084330b746d9 [media] rtl2832: wrap DVBv5 BER to DVBv3 f7caf93fb8ed [media] rtl2832: wrap DVBv5 CNR to DVBv3 SNR 6b4fd01804ce [media] rtl2832: implement DVBv5 BER statistic 19d273d63552 [media] rtl2832: implement DVBv5 CNR statistic 6dcfe3cc2e33 [media] rtl2830: wrap DVBv5 CNR to DVBv3 SNR f491391cc331 [media] rtl2830: wrap DVBv5 BER to DVBv3 d512e286512c [media] rtl2830: wrap DVBv5 signal strength to DVBv3 5bb11ca5864a [media] rtl2830: implement DVBv5 BER statistic 871f70252b6f [media] rtl2830: implement DVBv5 signal strength statistics 47b4dbfff1f3 [media] rtl2830: implement DVBv5 CNR statistic 2db4d179e16d [media] af9033: init DVBv5 statistics e53c47445bb5 [media] af9033: wrap DVBv3 BER to DVBv5 BER 1d0ceae4a19d [media] af9033: wrap DVBv3 UCB to DVBv5 UCB stats 6bb096c92671 [media] af9033: implement DVBv5 post-Viterbi BER 204f4319289f [media] af9033: implement DVBv5 stat block counters 6b45778609db [media] af9033: wrap DVBv3 read SNR to DVBv5 CNR 3e41313aeadf [media] af9033: implement DVBv5 statistics for CNR 83f1161911c5 [media] af9033: implement DVBv5 statistics for signal strength 041ad449683b [media] dib7000p: Add DVBv5 stats support d591590e1b5b [media] drx-j: enable DVBv5 stats 03fdfbfd3b59 [media] drx-j: Prepare to use DVBv5 stats 7a9d85d5559f [media] dib8000: Fix UCB measure with DVBv5 stats 6ef06e78c74c [media] dib8000: add DVBv5 stats
Quoted 88 lines
Regards
Malcolm
Quoted 80 lines
Thanks,
MauroQuoted 76 lines
Signed-off-by Malcolm Priestley <[email protected]>--- drivers/media/usb/dvb-usb-v2/lmedm04.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)drivers/media/usb/dvb-usb-v2/lmedm04.c +24
-0@@ -145,6 +145,10 @@ struct lme2510_state {void *usb_buffer;/* Frontend original calls */ int (*fe_read_status)(struct dvb_frontend *,fe_status_t *); +int (*fe_read_signal_strength)(struct dvb_frontend *,u16 *); +int (*fe_read_snr)(struct dvb_frontend *,u16 *); +int (*fe_read_ber)(struct dvb_frontend *,u32 *); +int (*fe_read_ucblocks)(struct dvb_frontend *,u32 *);int (*fe_set_voltage)(struct dvb_frontend *,fe_sec_voltage_t );u8 dvb_usb_lme2510_firmware; };@@ -877,6 +881,9 @@ static int dm04_read_signal_strength(struct dvb_frontend *fe, u16 *strength) {struct lme2510_state *st =fe_to_priv (fe); +if (st->fe_read_signal_strength && !st->stream_on) +return st->fe_read_signal_strength (fe, strength); +switch (st->tuner_config) {case TUNER_LG : *strength =0xff - st->signal_level;@@ -898,6 +905,9 @@ static int dm04_read_snr(struct dvb_frontend *fe, u16 *snr) {struct lme2510_state *st =fe_to_priv (fe); +if (st->fe_read_snr && !st->stream_on) +return st->fe_read_snr (fe, snr); +switch (st->tuner_config) {case TUNER_LG : *snr =0xff - st->signal_sn;@@ -917,6 +927,11 @@ static int dm04_read_snr(struct dvb_frontend *fe, u16 *snr)static int dm04_read_ber (struct dvb_frontend *fe,u32 *ber) { +struct lme2510_state *st =fe_to_priv (fe); + +if (st->fe_read_ber && !st->stream_on) +return st->fe_read_ber (fe, ber); + *ber =0 ;return 0 ;@@ -924,6 +939,11 @@ static int dm04_read_ber(struct dvb_frontend *fe, u32 *ber)static int dm04_read_ucblocks (struct dvb_frontend *fe,u32 *ucblocks) { +struct lme2510_state *st =fe_to_priv (fe); + +if (st->fe_read_ucblocks && !st->stream_on) +return st->fe_read_ucblocks (fe, ucblocks); + *ucblocks =0 ;return 0 ;@@ -1036,6 +1056,10 @@ static int dm04_lme2510_frontend_attach(struct dvb_usb_adapter *adap) } st->fe_read_status = adap->fe[0 ]->ops.read_status; + st->fe_read_signal_strength = adap->fe[0 ]->ops.read_signal_strength; + st->fe_read_snr = adap->fe[0 ]->ops.read_snr; + st->fe_read_ber = adap->fe[0 ]->ops.read_ber; + st->fe_read_ucblocks = adap->fe[0 ]->ops.read_ucblocks; adap->fe[0 ]->ops.read_status = dm04_read_status; adap->fe[0 ]->ops.read_signal_strength = dm04_read_signal_strength;
Malcolm Priestley
maintainerRe: [PATCH 5/5] lmedm04: add read snr, signal strength and ber call backs
Quoted 19 lines · Mauro Carvalho Chehab
Em Tue, 03 Feb 2015 19:31:16 +0000
Malcolm Priestley <[email protected]> escreveu:Quoted 8 lines · Mauro Carvalho Chehab
Quoted 5 lines
Em Fri, 2 Jan 2015 13:56:31 +0000
Malcolm Priestley <[email protected]> escreveu:Quoted 1 line
This allows calling the original functions providing the streaming is off.
Quoted 7 lines
Quoted 4 lines
Malcolm,
I'm applying this patch series, as the driver has already some support for the legacy DVBv3 stats, but please port it to use DVBv5.
Hi Mauro,
I am not sure what you mean by this?
Quoted 8 lines
The DVB API version 3 has some issues with stats. The main one is that they don't provide any glue to userspace about what scale they use. Due to that, we've added a new API at DVB. We're gradually adding support for that on the already existing drivers.
Quoted 1 line
Are there any examples?
Yes. You can see, for example:
Thanks
Malcolm
Quoted 14 lines
$ git lg drivers/media/dvb-frontends/ |grep stats 906aaf5a195b [media] dvb:tc90522: fix stats report 1d0ceae4a19d [media] af9033: wrap DVBv3 UCB to DVBv5 UCB stats 041ad449683b [media] dib7000p: Add DVBv5 stats support d591590e1b5b [media] drx-j: enable DVBv5 stats 6983257813dc [media] drx-j: properly handle bit counts on stats 03fdfbfd3b59 [media] drx-j: Prepare to use DVBv5 stats 704f01bbc7e4 [media] dib8000: be sure that stats are available before reading them 7a9d85d5559f [media] dib8000: Fix UCB measure with DVBv5 stats 6ef06e78c74c [media] dib8000: add DVBv5 stats 8f3741e02831 [media] drxk: Add pre/post BER and PER/UCB stats 8b8e444a2711 [media] mb86a20s: Don't reset strength with the other stats 15b1c5a068e7 [media] mb86a20s: provide CNR stats before FE_HAS_SYNC