Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285743
b: refs/heads/master
c: 82a0501
h: refs/heads/master
i:
  285741: 8acd8d0
  285739: f8532a5
  285735: 96976a7
  285727: e946561
v: v3
  • Loading branch information
Malcolm Priestley authored and Mauro Carvalho Chehab committed Jan 6, 2012
1 parent 882c67c commit 3da8a61
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 245900c4a7a7d23c2e5b2b64b70770debcac5814
refs/heads/master: 82a05014733b24827fc246c3498e0b703b11211f
21 changes: 17 additions & 4 deletions trunk/drivers/media/dvb/frontends/it913x-fe.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ struct it913x_fe_state {
u8 tun_fdiv;
u8 tun_clk_mode;
u32 tun_fn_min;
u32 ucblocks;
};

static int it913x_read_reg(struct it913x_fe_state *state,
Expand Down Expand Up @@ -562,14 +563,26 @@ static int it913x_fe_read_snr(struct dvb_frontend *fe, u16 *snr)

static int it913x_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
{
*ber = 0;
struct it913x_fe_state *state = fe->demodulator_priv;
int ret;
u8 reg[5];
/* Read Aborted Packets and Pre-Viterbi error rate 5 bytes */
ret = it913x_read_reg(state, RSD_ABORT_PKT_LSB, reg, sizeof(reg));
state->ucblocks += (u32)(reg[1] << 8) | reg[0];
*ber = (u32)(reg[4] << 16) | (reg[3] << 8) | reg[2];
return 0;
}

static int it913x_fe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
{
*ucblocks = 0;
return 0;
struct it913x_fe_state *state = fe->demodulator_priv;
int ret;
u8 reg[2];
/* Aborted Packets */
ret = it913x_read_reg(state, RSD_ABORT_PKT_LSB, reg, sizeof(reg));
state->ucblocks += (u32)(reg[1] << 8) | reg[0];
*ucblocks = state->ucblocks;
return ret;
}

static int it913x_fe_get_frontend(struct dvb_frontend *fe)
Expand Down Expand Up @@ -959,5 +972,5 @@ static struct dvb_frontend_ops it913x_fe_ofdm_ops = {

MODULE_DESCRIPTION("it913x Frontend and it9137 tuner");
MODULE_AUTHOR("Malcolm Priestley tvboxspy@gmail.com");
MODULE_VERSION("1.12");
MODULE_VERSION("1.13");
MODULE_LICENSE("GPL");
10 changes: 10 additions & 0 deletions trunk/drivers/media/dvb/frontends/it913x-fe.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,16 @@ static inline struct dvb_frontend *it913x_fe_attach(
#define COEFF_1_2048 0x0001
#define XTAL_CLK 0x0025
#define BFS_FCW 0x0029

/* Error Regs */
#define RSD_ABORT_PKT_LSB 0x0032
#define RSD_ABORT_PKT_MSB 0x0033
#define RSD_BIT_ERR_0_7 0x0034
#define RSD_BIT_ERR_8_15 0x0035
#define RSD_BIT_ERR_23_16 0x0036
#define RSD_BIT_COUNT_LSB 0x0037
#define RSD_BIT_COUNT_MSB 0x0038

#define TPSD_LOCK 0x003c
#define TRAINING_MODE 0x0040
#define ADC_X_2 0x0045
Expand Down

0 comments on commit 3da8a61

Please sign in to comment.