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

Commit f3bb7e22 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

media: af9013: dvbv5 cnr 



Implement dvbv5 cnr.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 943a720f

drivers/media/dvb-frontends/af9013.c

+83 −5
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct af9013_state { 
	unsigned long set_frontend_jiffies;

	unsigned long read_status_jiffies;

	unsigned long strength_jiffies;

	unsigned long cnr_jiffies;

	bool first_tune;

	bool i2c_gate_state;

	unsigned int statistics_step:3;
@@ -179,7 +180,6 @@ static int af9013_statistics_snr_result(struct dvb_frontend *fe) 
{

	struct af9013_state *state = fe->demodulator_priv;

	struct i2c_client *client = state->client;

	struct dtv_frontend_properties *c = &fe->dtv_property_cache;

	int ret, i, len;

	unsigned int utmp;

	u8 buf[3];
@@ -235,9 +235,6 @@ static int af9013_statistics_snr_result(struct dvb_frontend *fe) 
	}

	state->snr = utmp * 10; /* dB/10 */



	c->cnr.stat[0].svalue = 1000 * utmp;

	c->cnr.stat[0].scale = FE_SCALE_DECIBEL;



	return 0;

err:

	dev_dbg(&client->dev, "failed %d\n", ret);
@@ -757,7 +754,7 @@ static int af9013_read_status(struct dvb_frontend *fe, enum fe_status *status) 
	struct dtv_frontend_properties *c = &fe->dtv_property_cache;

	int ret, stmp1;

	unsigned int utmp, utmp1, utmp2, utmp3, utmp4;

	u8 buf[2];

	u8 buf[3];



	dev_dbg(&client->dev, "\n");
@@ -869,6 +866,87 @@ static int af9013_read_status(struct dvb_frontend *fe, enum fe_status *status) 
		break;

	}



	/* CNR */

	switch (state->fe_status & FE_HAS_VITERBI) {

	case FE_HAS_VITERBI:

		if (time_is_after_jiffies(state->cnr_jiffies + msecs_to_jiffies(2000)))

			break;



		/* Check if cnr ready */

		ret = regmap_read(state->regmap, 0xd2e1, &utmp);

		if (ret)

			goto err;



		if (!((utmp >> 3) & 0x01)) {

			dev_dbg(&client->dev, "cnr not ready\n");

			break;

		}



		/* Read value */

		ret = regmap_bulk_read(state->regmap, 0xd2e3, buf, 3);

		if (ret)

			goto err;



		utmp1 = buf[2] << 16 | buf[1] << 8 | buf[0] << 0;



		/* Read current modulation */

		ret = regmap_read(state->regmap, 0xd3c1, &utmp);

		if (ret)

			goto err;



		switch ((utmp >> 6) & 3) {

		case 0:

			/*

			 * QPSK

			 * CNR[dB] 13 * -log10((1690000 - value) / value) + 2.6

			 * value [653799, 1689999], 2.6 / 13 = 3355443

			 */

			utmp1 = clamp(utmp1, 653799U, 1689999U);

			utmp1 = ((u64)(intlog10(utmp1)

				- intlog10(1690000 - utmp1)

				+ 3355443) * 13 * 1000) >> 24;

			break;

		case 1:

			/*

			 * QAM-16

			 * CNR[dB] 6 * log10((value - 370000) / (828000 - value)) + 15.7

			 * value [371105, 827999], 15.7 / 6 = 43900382

			 */

			utmp1 = clamp(utmp1, 371105U, 827999U);

			utmp1 = ((u64)(intlog10(utmp1 - 370000)

				- intlog10(828000 - utmp1)

				+ 43900382) * 6 * 1000) >> 24;

			break;

		case 2:

			/*

			 * QAM-64

			 * CNR[dB] 8 * log10((value - 193000) / (425000 - value)) + 23.8

			 * value [193246, 424999], 23.8 / 8 = 49912218

			 */

			utmp1 = clamp(utmp1, 193246U, 424999U);

			utmp1 = ((u64)(intlog10(utmp1 - 193000)

				- intlog10(425000 - utmp1)

				+ 49912218) * 8 * 1000) >> 24;

			break;

		default:

			dev_dbg(&client->dev, "invalid modulation %u\n",

				(utmp >> 6) & 3);

			utmp1 = 0;

			break;

		}



		dev_dbg(&client->dev, "cnr %u\n", utmp1);



		state->cnr_jiffies = jiffies;



		c->cnr.stat[0].scale = FE_SCALE_DECIBEL;

		c->cnr.stat[0].svalue = utmp1;

		break;

	default:

		c->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE;

		break;

	}



	return 0;

err:

	dev_dbg(&client->dev, "failed %d\n", ret);

drivers/media/dvb-frontends/af9013_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#define AF9013_PRIV_H



#include <media/dvb_frontend.h>

#include <media/dvb_math.h>

#include "af9013.h"

#include <linux/firmware.h>

#include <linux/math64.h>