Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9f6ef69 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

soc-camera: add support for VIDIOC_S_PARM and VIDIOC_G_PARM ioctls 



Just pass VIDIOC_S_PARM and VIDIOC_G_PARM down to host drivers. So far no
special handling in soc-camera core.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d74f841c

drivers/media/video/soc_camera.c

+28 −0
Original line number Diff line number Diff line
@@ -781,6 +781,32 @@ static int soc_camera_s_crop(struct file *file, void *fh, 
	return ret;

}



static int soc_camera_g_parm(struct file *file, void *fh,

			     struct v4l2_streamparm *a)

{

	struct soc_camera_file *icf = file->private_data;

	struct soc_camera_device *icd = icf->icd;

	struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);



	if (ici->ops->get_parm)

		return ici->ops->get_parm(icd, a);



	return -ENOIOCTLCMD;

}



static int soc_camera_s_parm(struct file *file, void *fh,

			     struct v4l2_streamparm *a)

{

	struct soc_camera_file *icf = file->private_data;

	struct soc_camera_device *icd = icf->icd;

	struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);



	if (ici->ops->set_parm)

		return ici->ops->set_parm(icd, a);



	return -ENOIOCTLCMD;

}



static int soc_camera_g_chip_ident(struct file *file, void *fh,

				   struct v4l2_dbg_chip_ident *id)

{
@@ -1256,6 +1282,8 @@ static const struct v4l2_ioctl_ops soc_camera_ioctl_ops = { 
	.vidioc_cropcap		 = soc_camera_cropcap,

	.vidioc_g_crop		 = soc_camera_g_crop,

	.vidioc_s_crop		 = soc_camera_s_crop,

	.vidioc_g_parm		 = soc_camera_g_parm,

	.vidioc_s_parm		 = soc_camera_s_parm,

	.vidioc_g_chip_ident     = soc_camera_g_chip_ident,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.vidioc_g_register	 = soc_camera_g_register,

include/media/soc_camera.h

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ struct soc_camera_host_ops { 
	int (*set_bus_param)(struct soc_camera_device *, __u32);

	int (*get_ctrl)(struct soc_camera_device *, struct v4l2_control *);

	int (*set_ctrl)(struct soc_camera_device *, struct v4l2_control *);

	int (*get_parm)(struct soc_camera_device *, struct v4l2_streamparm *);

	int (*set_parm)(struct soc_camera_device *, struct v4l2_streamparm *);

	unsigned int (*poll)(struct file *, poll_table *);

	const struct v4l2_queryctrl *controls;

	int num_controls;