lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB: af9013: af9013_read_status() refactoring

Browse Source 
Function af9013_read_status() refactoring. Read lock bits in different
order to save count of register reads.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari
2010-06-17 20:56:27 -03:00
committed by Mauro Carvalho Chehab
parent 737fabf051
commit 8af5e3813b
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/media/dvb/frontends/af9013.c
View File

@@ -1184,21 +1184,43 @@ static int af9013_read_status(struct dvb_frontend *fe, fe_status_t *status)
u8 tmp; u8 tmp;
*status = 0; *status = 0;
/* TPS lock */
ret = af9013_read_reg_bits(state, 0xd330, 3, 1, &tmp);
if (ret)
goto error;
if (tmp)
*status |= FE_HAS_VITERBI | FE_HAS_CARRIER | FE_HAS_SIGNAL;
/* MPEG2 lock */ /* MPEG2 lock */
ret = af9013_read_reg_bits(state, 0xd507, 6, 1, &tmp); ret = af9013_read_reg_bits(state, 0xd507, 6, 1, &tmp);
if (ret) if (ret)
goto error; goto error;
if (tmp) if (tmp)
*status |= FE_HAS_SYNC | FE_HAS_LOCK; *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |
FE_HAS_SYNC | FE_HAS_LOCK;
if (!(*status & FE_HAS_SIGNAL)) { if (!*status) {
/* TPS lock */
ret = af9013_read_reg_bits(state, 0xd330, 3, 1, &tmp);
if (ret)
goto error;
if (tmp)
*status |= FE_HAS_SIGNAL | FE_HAS_CARRIER |
FE_HAS_VITERBI;
}
if (!*status) {
/* CFO lock */
ret = af9013_read_reg_bits(state, 0xd333, 7, 1, &tmp);
if (ret)
goto error;
if (tmp)
*status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
}
if (!*status) {
/* SFOE lock */
ret = af9013_read_reg_bits(state, 0xd334, 6, 1, &tmp);
if (ret)
goto error;
if (tmp)
*status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
}
if (!*status) {
/* AGC lock */ /* AGC lock */
ret = af9013_read_reg_bits(state, 0xd1a0, 6, 1, &tmp); ret = af9013_read_reg_bits(state, 0xd1a0, 6, 1, &tmp);
if (ret) if (ret)
@@ -1207,24 +1229,6 @@ static int af9013_read_status(struct dvb_frontend *fe, fe_status_t *status)
*status |= FE_HAS_SIGNAL; *status |= FE_HAS_SIGNAL;
} }
if (!(*status & FE_HAS_CARRIER)) {
/* CFO lock */
ret = af9013_read_reg_bits(state, 0xd333, 7, 1, &tmp);
if (ret)
goto error;
if (tmp)
*status |= FE_HAS_CARRIER;
}
if (!(*status & FE_HAS_CARRIER)) {
/* SFOE lock */
ret = af9013_read_reg_bits(state, 0xd334, 6, 1, &tmp);
if (ret)
goto error;
if (tmp)
*status |= FE_HAS_CARRIER;
}
ret = af9013_update_statistics(fe); ret = af9013_update_statistics(fe);
error: error: