mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 07:04:44 +00:00
Code Issues Releases Wiki Activity

[media] rtl2830: wrap DVBv5 CNR to DVBv3 SNR

Browse source 
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>
This commit is contained in:
Antti Palosaari 2014-12-09 10:48:10 -03:00 committed by Mauro Carvalho Chehab
parent f491391cc3
commit 6dcfe3cc2e
2 changed files with 4 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/media/dvb-frontends/rtl2830.c
View file

@ -544,52 +544,14 @@ static int rtl2830_read_status(struct dvb_frontend *fe, fe_status_t *status)
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},
};
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
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];
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)

1
drivers/media/dvb-frontends/rtl2830_priv.h
View file

@ -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;