diff options
| author | Antti Palosaari <crope@iki.fi> | 2014-12-09 16:48:10 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-02 22:56:14 +0300 |
| commit | 6dcfe3cc2e33ecd04987828ccbf56d6eda9a833f (patch) | |
| tree | 860bf9d04d06f1aed012a3d7bcda097af7cc0a38 | |
| parent | f491391cc331921524aed578075e93f622a5e533 (diff) | |
| download | linux-6dcfe3cc2e33ecd04987828ccbf56d6eda9a833f.tar.xz | |
[media] rtl2830: wrap DVBv5 CNR to DVBv3 SNR
Change legacy DVBv3 read SNR to return values calculated by DVBv5
statistics.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | drivers/media/dvb-frontends/rtl2830.c | 44 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/rtl2830_priv.h | 1 |
2 files changed, 4 insertions, 41 deletions
diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c index 0112b3f13a4b..f1f1cfb6cb16 100644 --- a/drivers/media/dvb-frontends/rtl2830.c +++ b/drivers/media/dvb-frontends/rtl2830.c @@ -544,52 +544,14 @@ err: static int rtl2830_read_snr(struct dvb_frontend *fe, u16 *snr) { - struct i2c_client *client = fe->demodulator_priv; - struct rtl2830_dev *dev = i2c_get_clientdata(client); - int ret, hierarchy, constellation; - u8 buf[2], tmp; - u16 tmp16; -#define CONSTELLATION_NUM 3 -#define HIERARCHY_NUM 4 - static const u32 snr_constant[CONSTELLATION_NUM][HIERARCHY_NUM] = { - {70705899, 70705899, 70705899, 70705899}, - {82433173, 82433173, 87483115, 94445660}, - {92888734, 92888734, 95487525, 99770748}, - }; - - if (dev->sleeping) - return 0; - - /* reports SNR in resolution of 0.1 dB */ - - ret = rtl2830_rd_reg(client, 0x33c, &tmp); - if (ret) - goto err; - - constellation = (tmp >> 2) & 0x03; /* [3:2] */ - if (constellation > CONSTELLATION_NUM - 1) - goto err; - - hierarchy = (tmp >> 4) & 0x07; /* [6:4] */ - if (hierarchy > HIERARCHY_NUM - 1) - goto err; - - ret = rtl2830_rd_regs(client, 0x40c, buf, 2); - if (ret) - goto err; - - tmp16 = buf[0] << 8 | buf[1]; + struct dtv_frontend_properties *c = &fe->dtv_property_cache; - if (tmp16) - *snr = (snr_constant[constellation][hierarchy] - - intlog10(tmp16)) / ((1 << 24) / 100); + if (c->cnr.stat[0].scale == FE_SCALE_DECIBEL) + *snr = div_s64(c->cnr.stat[0].svalue, 100); else *snr = 0; return 0; -err: - dev_dbg(&client->dev, "failed=%d\n", ret); - return ret; } static int rtl2830_read_ber(struct dvb_frontend *fe, u32 *ber) diff --git a/drivers/media/dvb-frontends/rtl2830_priv.h b/drivers/media/dvb-frontends/rtl2830_priv.h index 6636834baf20..6a0e982584f3 100644 --- a/drivers/media/dvb-frontends/rtl2830_priv.h +++ b/drivers/media/dvb-frontends/rtl2830_priv.h @@ -22,6 +22,7 @@ #include "dvb_math.h" #include "rtl2830.h" #include <linux/i2c-mux.h> +#include <linux/math64.h> struct rtl2830_dev { struct rtl2830_platform_data *pdata; |