Re: [PATCH 1/2] soc-camera: add support for VIDIOC_S_PARM and VIDIOC_G_PARM ioctls

[Kuninori Morimoto]

Dear Guennadi

Thank you for your hack

 + .vidioc_g_parm   = soc_camera_g_parm,
 + .vidioc_s_parm   = soc_camera_s_parm,

If soc_camera_g_param was defined, 
VIDIOC_G_PARM operation will be changed in v4l2-ioctl.c :: __video_do_ioctl
In fact, It was my anxiety.
But this patch seems good for me.
Thank you

Best regards
--
Kuninori Morimoto
 
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/2] soc-camera: add support for VIDIOC_S_PARM and VIDIOC_G_PARM ioctls

[Guennadi Liakhovetski]

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: Guennadi Liakhovetski g.liakhovet...@gmx.de
---
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 6b3fbcc..abce210 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -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)
 {
@@ -1260,6 +1286,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,
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index dcc5b86..5a17365 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -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;
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html