Hello Niklas,
Thank you for the patch.
On Wednesday 25 May 2016 21:10:04 Niklas Söderlund wrote:
> From: Ulrich Hecht <ulrich.hecht+renesas@xxxxxxxxx>
>
> Adds ioctls DV_TIMINGS_CAP, ENUM_DV_TIMINGS, G_DV_TIMINGS, S_DV_TIMINGS,
> and QUERY_DV_TIMINGS.
>
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@xxxxxxxxx>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
> ---
> drivers/media/platform/rcar-vin/rcar-v4l2.c | 82 ++++++++++++++++++++++++++
> 1 file changed, 82 insertions(+)
>
> diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c
> b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 3788f8a..10a5c10 100644
> --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
> +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> @@ -400,6 +400,10 @@ static int rvin_enum_input(struct file *file, void
> *priv,
>
> i->type = V4L2_INPUT_TYPE_CAMERA;
> i->std = vin->vdev.tvnorms;
> +
> + if (v4l2_subdev_has_op(sd, pad, dv_timings_cap))
> + i->capabilities = V4L2_IN_CAP_DV_TIMINGS;
> +
> strlcpy(i->name, "Camera", sizeof(i->name));
>
> return 0;
> @@ -478,6 +482,78 @@ static int rvin_subscribe_event(struct v4l2_fh *fh,
> return v4l2_ctrl_subscribe_event(fh, sub);
> }
>
> +static int rvin_enum_dv_timings(struct file *file, void *priv_fh,
> + struct v4l2_enum_dv_timings *timings)
> +{
> + struct rvin_dev *vin = video_drvdata(file);
> + struct v4l2_subdev *sd = vin_to_source(vin);
> + int pad, ret;
pad can't be negative, you can make it an unsigned int.
unsigned int pad = timings->pad;
int ret;
timings->pad = vin->src_pad_idx;
> +
> + pad = timings->pad;
> + timings->pad = vin->src_pad_idx;
> +
> + ret = v4l2_subdev_call(sd, pad, enum_dv_timings, timings);
> +
> + timings->pad = pad;
> +
> + return ret;
> +}
> +
> +static int rvin_s_dv_timings(struct file *file, void *priv_fh,
> + struct v4l2_dv_timings *timings)
> +{
> + struct rvin_dev *vin = video_drvdata(file);
> + struct v4l2_subdev *sd = vin_to_source(vin);
> + int err;
The driver uses ret instead of err, let's keep it that way.
> +
> + err = v4l2_subdev_call(sd,
> + video, s_dv_timings, timings);
No need for a line break.
> + if (!err) {
I'd write this
if (ret)
return ret;
(with a return 0; at the end of the function) to lower the indentation level
of the code below.
> + vin->source.width = timings->bt.width;
> + vin->source.height = timings->bt.height;
> + vin->format.width = timings->bt.width;
> + vin->format.height = timings->bt.height;
> + }
> + return err;
> +}
> +
> +static int rvin_g_dv_timings(struct file *file, void *priv_fh,
> + struct v4l2_dv_timings *timings)
> +{
> + struct rvin_dev *vin = video_drvdata(file);
> + struct v4l2_subdev *sd = vin_to_source(vin);
> +
> + return v4l2_subdev_call(sd,
> + video, g_dv_timings, timings);
No need for a line break.
> +}
> +
> +static int rvin_query_dv_timings(struct file *file, void *priv_fh,
> + struct v4l2_dv_timings *timings)
> +{
> + struct rvin_dev *vin = video_drvdata(file);
> + struct v4l2_subdev *sd = vin_to_source(vin);
> +
> + return v4l2_subdev_call(sd,
> + video, query_dv_timings, timings);
No need for a line break.
> +}
> +
> +static int rvin_dv_timings_cap(struct file *file, void *priv_fh,
> + struct v4l2_dv_timings_cap *cap)
> +{
> + struct rvin_dev *vin = video_drvdata(file);
> + struct v4l2_subdev *sd = vin_to_source(vin);
> + int pad, ret;
Same comment as above about pad not being negative.
> +
> + pad = cap->pad;
> + cap->pad = vin->src_pad_idx;
> +
> + ret = v4l2_subdev_call(sd, pad, dv_timings_cap, cap);
> +
> + cap->pad = pad;
> +
> + return ret;
> +}
> +
> static const struct v4l2_ioctl_ops rvin_ioctl_ops = {
> .vidioc_querycap = rvin_querycap,
> .vidioc_try_fmt_vid_cap = rvin_try_fmt_vid_cap,
> @@ -494,6 +570,12 @@ static const struct v4l2_ioctl_ops rvin_ioctl_ops = {
> .vidioc_g_input = rvin_g_input,
> .vidioc_s_input = rvin_s_input,
>
> + .vidioc_dv_timings_cap = rvin_dv_timings_cap,
> + .vidioc_enum_dv_timings = rvin_enum_dv_timings,
> + .vidioc_g_dv_timings = rvin_g_dv_timings,
> + .vidioc_s_dv_timings = rvin_s_dv_timings,
> + .vidioc_query_dv_timings = rvin_query_dv_timings,
> +
> .vidioc_querystd = rvin_querystd,
> .vidioc_g_std = rvin_g_std,
> .vidioc_s_std = rvin_s_std,
--
Regards,
Laurent Pinchart
--
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
