OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (6139): tea5767: add get_rf_strength and improve status reading efficiency 

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky 2007-08-31 16:40:14 -03:00 committed by Mauro Carvalho Chehab
parent fd443f7444
commit 6b897f2c39
1 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/media/video/tea5767.c
View File

@ -264,48 +264,66 @@ static int set_radio_freq(struct dvb_frontend *fe,
return 0;
}
static int tea5767_signal(struct dvb_frontend *fe)
static int tea5767_read_status(struct dvb_frontend *fe, char *buffer)
{
unsigned char buffer[5];
int rc;
struct tea5767_priv *priv = fe->tuner_priv;
int rc;
memset(buffer, 0, sizeof(buffer));
if (5 != (rc = tuner_i2c_xfer_recv(&priv->i2c_props, buffer, 5)))
memset(buffer, 0, 5);
if (5 != (rc = tuner_i2c_xfer_recv(&priv->i2c_props, buffer, 5))) {
tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);
return -EREMOTEIO;
}
return ((buffer[3] & TEA5767_ADC_LEVEL_MASK) << 8);
return 0;
}
static int tea5767_stereo(struct dvb_frontend *fe)
static inline int tea5767_signal(struct dvb_frontend *fe, const char *buffer)
{
unsigned char buffer[5];
int rc;
struct tea5767_priv *priv = fe->tuner_priv;
memset(buffer, 0, sizeof(buffer));
if (5 != (rc = tuner_i2c_xfer_recv(&priv->i2c_props, buffer, 5)))
tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);
int signal = ((buffer[3] & TEA5767_ADC_LEVEL_MASK) << 8);
rc = buffer[2] & TEA5767_STEREO_MASK;
tuner_dbg("Signal strength: %d\n", signal);
tuner_dbg("radio ST GET = %02x\n", rc);
return signal;
}
return ((buffer[2] & TEA5767_STEREO_MASK) ? V4L2_TUNER_SUB_STEREO : 0);
static inline int tea5767_stereo(struct dvb_frontend *fe, const char *buffer)
{
struct tea5767_priv *priv = fe->tuner_priv;
int stereo = buffer[2] & TEA5767_STEREO_MASK;
tuner_dbg("Radio ST GET = %02x\n", stereo);
return (stereo ? V4L2_TUNER_SUB_STEREO : 0);
}
static int tea5767_get_status(struct dvb_frontend *fe, u32 *status)
{
struct tea5767_priv *priv = fe->tuner_priv;
int signal = tea5767_signal(fe);
unsigned char buffer[5];
*status = 0;
if (signal)
*status = TUNER_STATUS_LOCKED;
if (tea5767_stereo(fe))
*status |= TUNER_STATUS_STEREO;
if (0 == tea5767_read_status(fe, buffer)) {
if (tea5767_signal(fe, buffer))
*status = TUNER_STATUS_LOCKED;
if (tea5767_stereo(fe, buffer))
*status |= TUNER_STATUS_STEREO;
}
tuner_dbg("tea5767: Signal strength: %d\n", signal);
return 0;
}
static int tea5767_get_rf_strength(struct dvb_frontend *fe, u16 *strength)
{
unsigned char buffer[5];
*strength = 0;
if (0 == tea5767_read_status(fe, buffer))
*strength = tea5767_signal(fe, buffer);
return 0;
}
@ -393,6 +411,7 @@ static struct dvb_tuner_ops tea5767_tuner_ops = {
.release = tea5767_release,
.get_frequency = tea5767_get_frequency,
.get_status = tea5767_get_status,
.get_rf_strength = tea5767_get_rf_strength,
};
struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,