On 02/04/2014 02:39 AM, Antti Palosaari wrote:
> Implement gain and bandwidth controls using v4l2 control framework.
> Pointer to control handler is provided by exported symbol.
>
> Cc: Mauro Carvalho Chehab <m.chehab@xxxxxxxxxxx>
> Cc: Hans Verkuil <hverkuil@xxxxxxxxx>
> Signed-off-by: Antti Palosaari <crope@xxxxxx>
> ---
> drivers/media/tuners/e4000.c | 142 +++++++++++++++++++++++++++++++++++++-
> drivers/media/tuners/e4000.h | 14 ++++
> drivers/media/tuners/e4000_priv.h | 12 ++++
> 3 files changed, 167 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/tuners/e4000.c b/drivers/media/tuners/e4000.c
> index 9187190..11d31b0 100644
> --- a/drivers/media/tuners/e4000.c
> +++ b/drivers/media/tuners/e4000.c
> @@ -448,6 +448,110 @@ err:
> return ret;
> }
>
> +static int e4000_set_gain(struct dvb_frontend *fe)
> +{
> + struct e4000_priv *priv = fe->tuner_priv;
> + int ret;
> + u8 buf[2];
> + u8 u8tmp;
> + dev_dbg(&priv->client->dev, "%s: lna=%d mixer=%d if=%d\n", __func__,
> + priv->lna_gain->val, priv->mixer_gain->val,
> + priv->if_gain->val);
> +
> + if (fe->ops.i2c_gate_ctrl)
> + fe->ops.i2c_gate_ctrl(fe, 1);
> +
> + if (priv->lna_gain_auto->val && priv->if_gain_auto->val)
> + u8tmp = 0x17;
> + else if (priv->lna_gain_auto->val)
> + u8tmp = 0x19;
> + else if (priv->if_gain_auto->val)
> + u8tmp = 0x16;
> + else
> + u8tmp = 0x10;
> +
> + ret = e4000_wr_reg(priv, 0x1a, u8tmp);
> + if (ret)
> + goto err;
> +
> + if (priv->mixer_gain_auto->val)
> + u8tmp = 0x15;
> + else
> + u8tmp = 0x14;
> +
> + ret = e4000_wr_reg(priv, 0x20, u8tmp);
> + if (ret)
> + goto err;
> +
> + if (priv->lna_gain_auto->val == false) {
> + ret = e4000_wr_reg(priv, 0x14, priv->lna_gain->val);
> + if (ret)
> + goto err;
> + }
> +
> + if (priv->mixer_gain_auto->val == false) {
> + ret = e4000_wr_reg(priv, 0x15, priv->mixer_gain->val);
> + if (ret)
> + goto err;
> + }
> +
> + if (priv->if_gain_auto->val == false) {
> + buf[0] = e4000_if_gain_lut[priv->if_gain->val].reg16_val;
> + buf[1] = e4000_if_gain_lut[priv->if_gain->val].reg17_val;
> + ret = e4000_wr_regs(priv, 0x16, buf, 2);
> + if (ret)
> + goto err;
> + }
> +
> + if (fe->ops.i2c_gate_ctrl)
> + fe->ops.i2c_gate_ctrl(fe, 0);
> +
> + return 0;
> +err:
> + if (fe->ops.i2c_gate_ctrl)
> + fe->ops.i2c_gate_ctrl(fe, 0);
> +
> + dev_dbg(&priv->client->dev, "%s: failed=%d\n", __func__, ret);
> + return ret;
> +}
> +
> +static int e4000_s_ctrl(struct v4l2_ctrl *ctrl)
> +{
> + struct e4000_priv *priv =
> + container_of(ctrl->handler, struct e4000_priv, hdl);
> + struct dvb_frontend *fe = priv->fe;
> + struct dtv_frontend_properties *c = &fe->dtv_property_cache;
> + int ret;
> + dev_dbg(&priv->client->dev,
> + "%s: id=%d name=%s val=%d min=%d max=%d step=%d\n",
> + __func__, ctrl->id, ctrl->name, ctrl->val,
> + ctrl->minimum, ctrl->maximum, ctrl->step);
> +
> + switch (ctrl->id) {
> + case V4L2_CID_BANDWIDTH_AUTO:
> + case V4L2_CID_BANDWIDTH:
> + c->bandwidth_hz = priv->bandwidth->val;
> + ret = e4000_set_params(priv->fe);
> + break;
> + case V4L2_CID_LNA_GAIN_AUTO:
> + case V4L2_CID_LNA_GAIN:
> + case V4L2_CID_MIXER_GAIN_AUTO:
> + case V4L2_CID_MIXER_GAIN:
> + case V4L2_CID_IF_GAIN_AUTO:
> + case V4L2_CID_IF_GAIN:
> + ret = e4000_set_gain(priv->fe);
That won't work. You need to handle each gain cluster separately. The control
framework processes the controls one cluster at a time and takes a lock on the
master control before calling s_ctrl. The ctrl->val field is only valid inside
s_ctrl for the controls in the cluster, not for other controls. For other
controls only the ctrl->cur.val field is valid.
Regards,
Hans
> + break;
> + default:
> + ret = -EINVAL;
> + }
> +
> + return ret;
> +}
> +
> +static const struct v4l2_ctrl_ops e4000_ctrl_ops = {
> + .s_ctrl = e4000_s_ctrl,
> +};
> +
> static const struct dvb_tuner_ops e4000_tuner_ops = {
> .info = {
> .name = "Elonics E4000",
> @@ -463,6 +567,13 @@ static const struct dvb_tuner_ops e4000_tuner_ops = {
> .get_if_frequency = e4000_get_if_frequency,
> };
>
> +struct v4l2_ctrl_handler *e4000_get_ctrl_handler(struct dvb_frontend *fe)
> +{
> + struct e4000_priv *priv = fe->tuner_priv;
> + return &priv->hdl;
> +}
> +EXPORT_SYMBOL(e4000_get_ctrl_handler);
> +
> static int e4000_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> @@ -504,6 +615,35 @@ static int e4000_probe(struct i2c_client *client,
> if (ret < 0)
> goto err;
>
> + /* Register controls */
> + v4l2_ctrl_handler_init(&priv->hdl, 8);
> + priv->bandwidth_auto = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops,
> + V4L2_CID_BANDWIDTH_AUTO, 0, 1, 1, 1);
> + priv->bandwidth = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops,
> + V4L2_CID_BANDWIDTH, 4300000, 11000000, 100000, 4300000);
> + v4l2_ctrl_auto_cluster(2, &priv->bandwidth_auto, 0, false);
> + priv->lna_gain_auto = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops,
> + V4L2_CID_LNA_GAIN_AUTO, 0, 1, 1, 1);
> + priv->lna_gain = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops,
> + V4L2_CID_LNA_GAIN, 0, 15, 1, 10);
> + v4l2_ctrl_auto_cluster(2, &priv->lna_gain_auto, 0, false);
> + priv->mixer_gain_auto = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops,
> + V4L2_CID_MIXER_GAIN_AUTO, 0, 1, 1, 1);
> + priv->mixer_gain = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops,
> + V4L2_CID_MIXER_GAIN, 0, 1, 1, 1);
> + v4l2_ctrl_auto_cluster(2, &priv->mixer_gain_auto, 0, false);
> + priv->if_gain_auto = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops,
> + V4L2_CID_IF_GAIN_AUTO, 0, 1, 1, 1);
> + priv->if_gain = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops,
> + V4L2_CID_IF_GAIN, 0, 54, 1, 0);
> + v4l2_ctrl_auto_cluster(2, &priv->if_gain_auto, 0, false);
> + if (priv->hdl.error) {
> + ret = priv->hdl.error;
> + dev_err(&priv->client->dev, "Could not initialize controls\n");
> + v4l2_ctrl_handler_free(&priv->hdl);
> + goto err;
> + }
> +
> dev_info(&priv->client->dev,
> "%s: Elonics E4000 successfully identified\n",
> KBUILD_MODNAME);
> @@ -533,7 +673,7 @@ static int e4000_remove(struct i2c_client *client)
> struct dvb_frontend *fe = priv->fe;
>
> dev_dbg(&client->dev, "%s:\n", __func__);
> -
> + v4l2_ctrl_handler_free(&priv->hdl);
> memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));
> fe->tuner_priv = NULL;
> kfree(priv);
> diff --git a/drivers/media/tuners/e4000.h b/drivers/media/tuners/e4000.h
> index d95c472..d86de6d 100644
> --- a/drivers/media/tuners/e4000.h
> +++ b/drivers/media/tuners/e4000.h
> @@ -46,4 +46,18 @@ struct e4000_ctrl {
> int if_gain;
> };
>
> +#if IS_ENABLED(CONFIG_MEDIA_TUNER_E4000)
> +extern struct v4l2_ctrl_handler *e4000_get_ctrl_handler(
> + struct dvb_frontend *fe
> +);
> +#else
> +static inline struct v4l2_ctrl_handler *e4000_get_ctrl_handler(
> + struct dvb_frontend *fe
> +)
> +{
> + pr_warn("%s: driver disabled by Kconfig\n", __func__);
> + return NULL;
> +}
> +#endif
> +
> #endif
> diff --git a/drivers/media/tuners/e4000_priv.h b/drivers/media/tuners/e4000_priv.h
> index a75a383..8cc27b3 100644
> --- a/drivers/media/tuners/e4000_priv.h
> +++ b/drivers/media/tuners/e4000_priv.h
> @@ -22,11 +22,23 @@
> #define E4000_PRIV_H
>
> #include "e4000.h"
> +#include <media/v4l2-ctrls.h>
>
> struct e4000_priv {
> struct i2c_client *client;
> u32 clock;
> struct dvb_frontend *fe;
> +
> + /* Controls */
> + struct v4l2_ctrl_handler hdl;
> + struct v4l2_ctrl *bandwidth_auto;
> + struct v4l2_ctrl *bandwidth;
> + struct v4l2_ctrl *lna_gain_auto;
> + struct v4l2_ctrl *lna_gain;
> + struct v4l2_ctrl *mixer_gain_auto;
> + struct v4l2_ctrl *mixer_gain;
> + struct v4l2_ctrl *if_gain_auto;
> + struct v4l2_ctrl *if_gain;
> };
>
> struct e4000_pll {
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
