aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorChris Pascoe <c.pascoe@itee.uq.edu.au>2007-02-10 10:19:16 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:35:25 -0200
commit6345f0f6428cc7a3f73b83624c6f97629a9fddd1 (patch)
treed85a30392e5f56b8dad80e572c8925c41a0c5111 /drivers/media
parentV4L/DVB (5217): Zl10353: Implement TRL nominal rate calculation (diff)
downloadlinux-dev-6345f0f6428cc7a3f73b83624c6f97629a9fddd1.tar.xz
linux-dev-6345f0f6428cc7a3f73b83624c6f97629a9fddd1.zip
V4L/DVB (5218): Zl10353: register definitions update
Update the descriptions of "discovered" registers on the zl10353, using the equivalaent mt352 register names. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/frontends/zl10353.c14
-rw-r--r--drivers/media/dvb/frontends/zl10353_priv.h7
2 files changed, 14 insertions, 7 deletions
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index dbb53ba6f414..245f9b7dddfa 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -258,9 +258,9 @@ static int zl10353_read_ber(struct dvb_frontend *fe, u32 *ber)
{
struct zl10353_state *state = fe->demodulator_priv;
- *ber = zl10353_read_register(state, 0x11) << 16 |
- zl10353_read_register(state, 0x12) << 8 |
- zl10353_read_register(state, 0x13);
+ *ber = zl10353_read_register(state, RS_ERR_CNT_2) << 16 |
+ zl10353_read_register(state, RS_ERR_CNT_1) << 8 |
+ zl10353_read_register(state, RS_ERR_CNT_0);
return 0;
}
@@ -269,8 +269,8 @@ static int zl10353_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
{
struct zl10353_state *state = fe->demodulator_priv;
- u16 signal = zl10353_read_register(state, 0x0a) << 10 |
- zl10353_read_register(state, 0x0b) << 2 | 3;
+ u16 signal = zl10353_read_register(state, AGC_GAIN_1) << 10 |
+ zl10353_read_register(state, AGC_GAIN_0) << 2 | 3;
*strength = ~signal;
@@ -295,8 +295,8 @@ static int zl10353_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
{
struct zl10353_state *state = fe->demodulator_priv;
- *ucblocks = zl10353_read_register(state, 0x14) << 8 |
- zl10353_read_register(state, 0x15);
+ *ucblocks = zl10353_read_register(state, RS_UBC_1) << 8 |
+ zl10353_read_register(state, RS_UBC_0);
return 0;
}
diff --git a/drivers/media/dvb/frontends/zl10353_priv.h b/drivers/media/dvb/frontends/zl10353_priv.h
index d2186927f8f1..4962434b35e7 100644
--- a/drivers/media/dvb/frontends/zl10353_priv.h
+++ b/drivers/media/dvb/frontends/zl10353_priv.h
@@ -38,7 +38,14 @@ enum zl10353_reg_addr {
STATUS_7 = 0x07,
STATUS_8 = 0x08,
STATUS_9 = 0x09,
+ AGC_GAIN_1 = 0x0A,
+ AGC_GAIN_0 = 0x0B,
SNR = 0x10,
+ RS_ERR_CNT_2 = 0x11,
+ RS_ERR_CNT_1 = 0x12,
+ RS_ERR_CNT_0 = 0x13,
+ RS_UBC_1 = 0x14,
+ RS_UBC_0 = 0x15,
TRL_NOMINAL_RATE_1 = 0x65,
TRL_NOMINAL_RATE_0 = 0x66,
CHIP_ID = 0x7F,