Skip to contentSkip to conversation

stv090x: use error counter 1 for BER estimation

PATCH In review Andreas Regel 2 participants 3 messages Feb 27, 2012 – Mar 11, 2012 Media (V4L/DVB)

lore
Share & tools
lore

Andreas Regel

author
#0 lore raw

PATCH 2/3 stv090x: use error counter 1 for BER estimation

Use error counter 1 of the STV090x to get a correct bit error rate value.

Signed-off-by Andreas Regel <[email protected]>
---
 drivers/media/dvb/frontends/stv090x.c |   30 
+++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)
drivers/media/dvb/frontends/stv090x.c +27 -0
index 6c3c095..afbd50c 100644
@@ -3512,6 +3512,33 @@ static int stv090x_read_status(struct dvb_frontend *fe, enum fe_status *status)
 	return 0;
 }
 +static int stv090x_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+	struct stv090x_state *state = fe->demodulator_priv;
+
+	u32 reg, h, m, l;
+	enum fe_status status;
+
+	stv090x_read_status(fe, &status);
+	if (!(status & FE_HAS_LOCK)) {
+		*ber = 1 << 23; /* Max BER */
+	} else {
+		/* Counter 1 */
+		reg = STV090x_READ_DEMOD(state, ERRCNT12);
+		h = STV090x_GETFIELD_Px(reg, ERR_CNT12_FIELD);
+
+		reg = STV090x_READ_DEMOD(state, ERRCNT11);
+		m = STV090x_GETFIELD_Px(reg, ERR_CNT11_FIELD);
+
+		reg = STV090x_READ_DEMOD(state, ERRCNT10);
+		l = STV090x_GETFIELD_Px(reg, ERR_CNT10_FIELD);
+
+		*ber = ((h << 16) | (m << 8) | l);
+	}
+	return 0;
+}
+
+#if 0
 static int stv090x_read_per(struct dvb_frontend *fe, u32 *per)
 {
 	struct stv090x_state *state = fe->demodulator_priv;

@@ -3562,6 +3589,7 @@ err:
 	dprintk(FE_ERROR, 1, "I/O error");
 	return -1;
 }
+#endif
  static int stv090x_table_lookup(const struct stv090x_tab *tab, int

max, int val)
{
@@ -4740,7 +4768,7 @@ static struct dvb_frontend_ops stv090x_ops = {
.search = stv090x_search,
.read_status = stv090x_read_status,
- .read_ber = stv090x_read_per,
+ .read_ber = stv090x_read_ber,
.read_signal_strength = stv090x_read_signal_strength,
.read_snr = stv090x_read_cnr,
};

Signature · 1 line
1.7.2.5
#1 lore raw

Em 27-02-2012 17:42, Andreas Regel escreveu:

Quoted 1 line

Use error counter 1 of the STV090x to get a correct bit error rate value.

Also line-wrapped and mandled by your email.

Quoted 58 lines
Signed-off-by Andreas Regel <[email protected]>
---
 drivers/media/dvb/frontends/stv090x.c |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)
drivers/media/dvb/frontends/stv090x.c +28 -1
index 6c3c095..afbd50c 100644
@@ -3512,6 +3512,33 @@ static int stv090x_read_status(struct dvb_frontend *fe, enum fe_status *status)
     return 0;
 }
 +static int stv090x_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+    struct stv090x_state *state = fe->demodulator_priv;
+
+    u32 reg, h, m, l;
+    enum fe_status status;
+
+    stv090x_read_status(fe, &status);
+    if (!(status & FE_HAS_LOCK)) {
+        *ber = 1 << 23; /* Max BER */
+    } else {
+        /* Counter 1 */
+        reg = STV090x_READ_DEMOD(state, ERRCNT12);
+        h = STV090x_GETFIELD_Px(reg, ERR_CNT12_FIELD);
+
+        reg = STV090x_READ_DEMOD(state, ERRCNT11);
+        m = STV090x_GETFIELD_Px(reg, ERR_CNT11_FIELD);
+
+        reg = STV090x_READ_DEMOD(state, ERRCNT10);
+        l = STV090x_GETFIELD_Px(reg, ERR_CNT10_FIELD);
+
+        *ber = ((h << 16) | (m << 8) | l);
+    }
+    return 0;
+}
+
+#if 0
 static int stv090x_read_per(struct dvb_frontend *fe, u32 *per)
 {
     struct stv090x_state *state = fe->demodulator_priv;

@@ -3562,6 +3589,7 @@ err:
     dprintk(FE_ERROR, 1, "I/O error");
     return -1;
 }
+#endif
  static int stv090x_table_lookup(const struct stv090x_tab *tab, int max, int val)
 {

@@ -4740,7 +4768,7 @@ static struct dvb_frontend_ops stv090x_ops = {
      .search                = stv090x_search,
     .read_status            = stv090x_read_status,
-    .read_ber            = stv090x_read_per,
+    .read_ber            = stv090x_read_ber,
     .read_signal_strength        = stv090x_read_signal_strength,
     .read_snr            = stv090x_read_cnr,
 };
author
#2 lore raw
---
 drivers/media/dvb/frontends/stv090x.c |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)
drivers/media/dvb/frontends/stv090x.c +29 -1
index 6c3c095..afbd50c 100644
@@ -3512,6 +3512,33 @@ static int stv090x_read_status(struct dvb_frontend *fe, enum fe_status *status)
 	return 0;
 }
 
+static int stv090x_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+	struct stv090x_state *state = fe->demodulator_priv;
+
+	u32 reg, h, m, l;
+	enum fe_status status;
+
+	stv090x_read_status(fe, &status);
+	if (!(status & FE_HAS_LOCK)) {
+		*ber = 1 << 23; /* Max BER */
+	} else {
+		/* Counter 1 */
+		reg = STV090x_READ_DEMOD(state, ERRCNT12);
+		h = STV090x_GETFIELD_Px(reg, ERR_CNT12_FIELD);
+
+		reg = STV090x_READ_DEMOD(state, ERRCNT11);
+		m = STV090x_GETFIELD_Px(reg, ERR_CNT11_FIELD);
+
+		reg = STV090x_READ_DEMOD(state, ERRCNT10);
+		l = STV090x_GETFIELD_Px(reg, ERR_CNT10_FIELD);
+
+		*ber = ((h << 16) | (m << 8) | l);
+	}
+	return 0;
+}
+
+#if 0
 static int stv090x_read_per(struct dvb_frontend *fe, u32 *per)
 {
 	struct stv090x_state *state = fe->demodulator_priv;

@@ -3562,6 +3589,7 @@ err:
 	dprintk(FE_ERROR, 1, "I/O error");
 	return -1;
 }
+#endif
 
 static int stv090x_table_lookup(const struct stv090x_tab *tab, int max, int val)
 {

@@ -4740,7 +4768,7 @@ static struct dvb_frontend_ops stv090x_ops = {
 
 	.search				= stv090x_search,
 	.read_status			= stv090x_read_status,
-	.read_ber			= stv090x_read_per,
+	.read_ber			= stv090x_read_ber,
 	.read_signal_strength		= stv090x_read_signal_strength,
 	.read_snr			= stv090x_read_cnr,
 };
Signature · 1 line
1.7.2.5