V4L/DVB: v4l2: hook up the new control framework into the core framework

Add the calls needed to automatically merge subdev controls into a bridge
control handler.

Hook up the control framework in __video_ioctl2 and video_register_device.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 9e89bf617790b46b67ce7cc9155d28df9d8bf9ed..21ffd030611eb9c500ab0bdf658c5cac0d0f33d8 100644 (file)
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -447,8 +447,12 @@ static int __video_register_device(struct video_device *vdev, int type, int nr,
 
        vdev->vfl_type = type;
        vdev->cdev = NULL;
-       if (vdev->v4l2_dev && vdev->v4l2_dev->dev)
-               vdev->parent = vdev->v4l2_dev->dev;
+       if (vdev->v4l2_dev) {
+               if (vdev->v4l2_dev->dev)
+                       vdev->parent = vdev->v4l2_dev->dev;
+               if (vdev->ctrl_handler == NULL)
+                       vdev->ctrl_handler = vdev->v4l2_dev->ctrl_handler;
+       }
 
        /* Part 2: find a free minor, device node number and device index. */
 #ifdef CONFIG_VIDEO_FIXED_MINOR_RANGES

diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
index 5a7dc4afe92a2e4ca7872df5f06cab3443ff79f8..0b08f96b74a5ed5c750fdcc7541d2e38f069d79f 100644 (file)
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -26,6 +26,7 @@
 #endif
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
+#include <media/v4l2-ctrls.h>
 
 int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev)
 {
@@ -115,6 +116,8 @@ EXPORT_SYMBOL_GPL(v4l2_device_unregister);
 int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
                                                struct v4l2_subdev *sd)
 {
+       int err;
+
        /* Check for valid input */
        if (v4l2_dev == NULL || sd == NULL || !sd->name[0])
                return -EINVAL;
@@ -122,6 +125,10 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
        WARN_ON(sd->v4l2_dev != NULL);
        if (!try_module_get(sd->owner))
                return -ENODEV;
+       /* This just returns 0 if either of the two args is NULL */
+       err = v4l2_ctrl_add_handler(v4l2_dev->ctrl_handler, sd->ctrl_handler);
+       if (err)
+               return err;
        sd->v4l2_dev = v4l2_dev;
        spin_lock(&v4l2_dev->lock);
        list_add_tail(&sd->list, &v4l2_dev->subdevs);

diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 0eeceae503293da68debf793fb40e10906f17acb..dd9283fcb5643584d44628d447ec0791b86654a9 100644 (file)
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -26,6 +26,7 @@
 #endif
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-ctrls.h>
 #include <media/v4l2-fh.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-chip-ident.h>
@@ -1259,9 +1260,12 @@ static long __video_do_ioctl(struct file *file,
        {
                struct v4l2_queryctrl *p = arg;
 
-               if (!ops->vidioc_queryctrl)
+               if (vfd->ctrl_handler)
+                       ret = v4l2_queryctrl(vfd->ctrl_handler, p);
+               else if (ops->vidioc_queryctrl)
+                       ret = ops->vidioc_queryctrl(file, fh, p);
+               else
                        break;
-               ret = ops->vidioc_queryctrl(file, fh, p);
                if (!ret)
                        dbgarg(cmd, "id=0x%x, type=%d, name=%s, min/max=%d/%d, "
                                        "step=%d, default=%d, flags=0x%08x\n",
@@ -1276,7 +1280,9 @@ static long __video_do_ioctl(struct file *file,
        {
                struct v4l2_control *p = arg;
 
-               if (ops->vidioc_g_ctrl)
+               if (vfd->ctrl_handler)
+                       ret = v4l2_g_ctrl(vfd->ctrl_handler, p);
+               else if (ops->vidioc_g_ctrl)
                        ret = ops->vidioc_g_ctrl(file, fh, p);
                else if (ops->vidioc_g_ext_ctrls) {
                        struct v4l2_ext_controls ctrls;
@@ -1306,11 +1312,16 @@ static long __video_do_ioctl(struct file *file,
                struct v4l2_ext_controls ctrls;
                struct v4l2_ext_control ctrl;
 
-               if (!ops->vidioc_s_ctrl && !ops->vidioc_s_ext_ctrls)
+               if (!vfd->ctrl_handler &&
+                       !ops->vidioc_s_ctrl && !ops->vidioc_s_ext_ctrls)
                        break;
 
                dbgarg(cmd, "id=0x%x, value=%d\n", p->id, p->value);
 
+               if (vfd->ctrl_handler) {
+                       ret = v4l2_s_ctrl(vfd->ctrl_handler, p);
+                       break;
+               }
                if (ops->vidioc_s_ctrl) {
                        ret = ops->vidioc_s_ctrl(file, fh, p);
                        break;
@@ -1332,10 +1343,12 @@ static long __video_do_ioctl(struct file *file,
                struct v4l2_ext_controls *p = arg;
 
                p->error_idx = p->count;
-               if (!ops->vidioc_g_ext_ctrls)
-                       break;
-               if (check_ext_ctrls(p, 0))
+               if (vfd->ctrl_handler)
+                       ret = v4l2_g_ext_ctrls(vfd->ctrl_handler, p);
+               else if (ops->vidioc_g_ext_ctrls && check_ext_ctrls(p, 0))
                        ret = ops->vidioc_g_ext_ctrls(file, fh, p);
+               else
+                       break;
                v4l_print_ext_ctrls(cmd, vfd, p, !ret);
                break;
        }
@@ -1344,10 +1357,12 @@ static long __video_do_ioctl(struct file *file,
                struct v4l2_ext_controls *p = arg;
 
                p->error_idx = p->count;
-               if (!ops->vidioc_s_ext_ctrls)
+               if (!vfd->ctrl_handler && !ops->vidioc_s_ext_ctrls)
                        break;
                v4l_print_ext_ctrls(cmd, vfd, p, 1);
-               if (check_ext_ctrls(p, 0))
+               if (vfd->ctrl_handler)
+                       ret = v4l2_s_ext_ctrls(vfd->ctrl_handler, p);
+               else if (check_ext_ctrls(p, 0))
                        ret = ops->vidioc_s_ext_ctrls(file, fh, p);
                break;
        }
@@ -1356,10 +1371,12 @@ static long __video_do_ioctl(struct file *file,
                struct v4l2_ext_controls *p = arg;
 
                p->error_idx = p->count;
-               if (!ops->vidioc_try_ext_ctrls)
+               if (!vfd->ctrl_handler && !ops->vidioc_try_ext_ctrls)
                        break;
                v4l_print_ext_ctrls(cmd, vfd, p, 1);
-               if (check_ext_ctrls(p, 0))
+               if (vfd->ctrl_handler)
+                       ret = v4l2_try_ext_ctrls(vfd->ctrl_handler, p);
+               else if (check_ext_ctrls(p, 0))
                        ret = ops->vidioc_try_ext_ctrls(file, fh, p);
                break;
        }
@@ -1367,9 +1384,12 @@ static long __video_do_ioctl(struct file *file,
        {
                struct v4l2_querymenu *p = arg;
 
-               if (!ops->vidioc_querymenu)
+               if (vfd->ctrl_handler)
+                       ret = v4l2_querymenu(vfd->ctrl_handler, p);
+               else if (ops->vidioc_querymenu)
+                       ret = ops->vidioc_querymenu(file, fh, p);
+               else
                        break;
-               ret = ops->vidioc_querymenu(file, fh, p);
                if (!ret)
                        dbgarg(cmd, "id=0x%x, index=%d, name=%s\n",
                                p->id, p->index, p->name);