Skip to content

Commit

Permalink
[media] tuner, xc2028: add support for get_afc()
Browse files Browse the repository at this point in the history
Implement API support to return AFC frequency shift, as this device
supports it. The only other driver that implements it is tda9887,
and the frequency there is reported in Hz. So, use Hz also for this
tuner.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Jul 4, 2012
1 parent 90acb85 commit 1d432a3
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 1 deletion.
46 changes: 45 additions & 1 deletion drivers/media/common/tuners/tuner-xc2028.c
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ static int xc2028_signal(struct dvb_frontend *fe, u16 *strength)
msleep(6);
}

/* Frequency was not locked */
/* Frequency didn't lock */
if (frq_lock == 2)
goto ret;

Expand All @@ -947,6 +947,49 @@ static int xc2028_signal(struct dvb_frontend *fe, u16 *strength)
return rc;
}

static int xc2028_get_afc(struct dvb_frontend *fe, s32 *afc)
{
struct xc2028_data *priv = fe->tuner_priv;
int i, rc;
u16 frq_lock = 0;
s16 afc_reg = 0;

rc = check_device_status(priv);
if (rc < 0)
return rc;

mutex_lock(&priv->lock);

/* Sync Lock Indicator */
for (i = 0; i < 3; i++) {
rc = xc2028_get_reg(priv, XREG_LOCK, &frq_lock);
if (rc < 0)
goto ret;

if (frq_lock)
break;
msleep(6);
}

/* Frequency didn't lock */
if (frq_lock == 2)
goto ret;

/* Get AFC */
rc = xc2028_get_reg(priv, XREG_FREQ_ERROR, &afc_reg);
if (rc < 0)
return rc;

*afc = afc_reg * 15625; /* Hz */

tuner_dbg("AFC is %d Hz\n", *afc);

ret:
mutex_unlock(&priv->lock);

return rc;
}

#define DIV 15625

static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
Expand Down Expand Up @@ -1392,6 +1435,7 @@ static const struct dvb_tuner_ops xc2028_dvb_tuner_ops = {
.release = xc2028_dvb_release,
.get_frequency = xc2028_get_frequency,
.get_rf_strength = xc2028_signal,
.get_afc = xc2028_get_afc,
.set_params = xc2028_set_params,
.sleep = xc2028_sleep,
};
Expand Down
1 change: 1 addition & 0 deletions drivers/media/dvb/dvb-core/dvb_frontend.h
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ struct dvb_tuner_ops {
#define TUNER_STATUS_STEREO 2
int (*get_status)(struct dvb_frontend *fe, u32 *status);
int (*get_rf_strength)(struct dvb_frontend *fe, u16 *strength);
int (*get_afc)(struct dvb_frontend *fe, s32 *afc);

/** These are provided separately from set_params in order to facilitate silicon
* tuners which require sophisticated tuning loops, controlling each parameter separately. */
Expand Down
11 changes: 11 additions & 0 deletions drivers/media/video/tuner-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,16 @@ static int fe_has_signal(struct dvb_frontend *fe)
return strength;
}

static int fe_get_afc(struct dvb_frontend *fe)
{
s32 afc = 0;

if (fe->ops.tuner_ops.get_afc)
fe->ops.tuner_ops.get_afc(fe, &afc);

return 0;
}

static int fe_set_config(struct dvb_frontend *fe, void *priv_cfg)
{
struct dvb_tuner_ops *fe_tuner_ops = &fe->ops.tuner_ops;
Expand All @@ -247,6 +257,7 @@ static struct analog_demod_ops tuner_analog_ops = {
.set_params = fe_set_params,
.standby = fe_standby,
.has_signal = fe_has_signal,
.get_afc = fe_get_afc,
.set_config = fe_set_config,
.tuner_status = tuner_status
};
Expand Down

0 comments on commit 1d432a3

Please sign in to comment.