V4L/DVB (9820): v4l2: add v4l2_device and v4l2_subdev structs to the v4l2 framework.

Start implementing a proper v4l2 framework as discussed during the
Linux Plumbers Conference 2008.

Introduces v4l2_device (for device instances) and v4l2_subdev (representing
sub-device instances).

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Reviewed-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Reviewed-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviewed-by: Andy Walls <awalls@radix.net>
Reviewed-by: David Brownell <david-b@pacbell.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 195 insertions, 1 deletions

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 492ab3dce71b..84a2be0cbbe7 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -10,7 +10,7 @@ stkwebcam-objs	:=	stk-webcam.o stk-sensor.o
 
 omap2cam-objs   :=      omap24xxcam.o omap24xxcam-dma.o
 
-videodev-objs   :=      v4l2-dev.o v4l2-ioctl.o
+videodev-objs   :=      v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-subdev.o
 
 obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-compat-ioctl32.o v4l2-int-device.o
 
diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
new file mode 100644
index 000000000000..9eefde031597
--- /dev/null
+++ b/drivers/media/video/v4l2-device.c
@@ -0,0 +1,86 @@
+/*
+    V4L2 device support.
+
+    Copyright (C) 2008  Hans Verkuil <hverkuil@xs4all.nl>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <linux/i2c.h>
+#include <linux/videodev2.h>
+#include <media/v4l2-device.h>
+
+int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev)
+{
+        if (dev == NULL || v4l2_dev == NULL)
+                return -EINVAL;
+        /* Warn if we apparently re-register a device */
+        WARN_ON(dev_get_drvdata(dev));
+        INIT_LIST_HEAD(&v4l2_dev->subdevs);
+        spin_lock_init(&v4l2_dev->lock);
+        v4l2_dev->dev = dev;
+        snprintf(v4l2_dev->name, sizeof(v4l2_dev->name), "%s %s",
+                        dev->driver->name, dev->bus_id);
+        dev_set_drvdata(dev, v4l2_dev);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(v4l2_device_register);
+
+void v4l2_device_unregister(struct v4l2_device *v4l2_dev)
+{
+        struct v4l2_subdev *sd, *next;
+
+        if (v4l2_dev == NULL || v4l2_dev->dev == NULL)
+                return;
+        dev_set_drvdata(v4l2_dev->dev, NULL);
+        /* unregister subdevs */
+        list_for_each_entry_safe(sd, next, &v4l2_dev->subdevs, list)
+                v4l2_device_unregister_subdev(sd);
+
+        v4l2_dev->dev = NULL;
+}
+EXPORT_SYMBOL_GPL(v4l2_device_unregister);
+
+int v4l2_device_register_subdev(struct v4l2_device *dev, struct v4l2_subdev *sd)
+{
+        /* Check for valid input */
+        if (dev == NULL || sd == NULL || !sd->name[0])
+                return -EINVAL;
+        /* Warn if we apparently re-register a subdev */
+        WARN_ON(sd->dev);
+        if (!try_module_get(sd->owner))
+                return -ENODEV;
+        sd->dev = dev;
+        spin_lock(&dev->lock);
+        list_add_tail(&sd->list, &dev->subdevs);
+        spin_unlock(&dev->lock);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(v4l2_device_register_subdev);
+
+void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)
+{
+        /* return if it isn't registered */
+        if (sd == NULL || sd->dev == NULL)
+                return;
+        spin_lock(&sd->dev->lock);
+        list_del(&sd->list);
+        spin_unlock(&sd->dev->lock);
+        sd->dev = NULL;
+        module_put(sd->owner);
+}
+EXPORT_SYMBOL_GPL(v4l2_device_unregister_subdev);
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
new file mode 100644
index 000000000000..fe1f01c970ac
--- /dev/null
+++ b/drivers/media/video/v4l2-subdev.c
@@ -0,0 +1,108 @@
+/*
+    V4L2 sub-device support.
+
+    Copyright (C) 2008  Hans Verkuil <hverkuil@xs4all.nl>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <linux/i2c.h>
+#include <linux/videodev2.h>
+#include <media/v4l2-subdev.h>
+
+int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg)
+{
+        switch (cmd) {
+        case VIDIOC_QUERYCTRL:
+                return v4l2_subdev_call(sd, core, querymenu, arg);
+        case VIDIOC_G_CTRL:
+                return v4l2_subdev_call(sd, core, g_ctrl, arg);
+        case VIDIOC_S_CTRL:
+                return v4l2_subdev_call(sd, core, s_ctrl, arg);
+        case VIDIOC_QUERYMENU:
+                return v4l2_subdev_call(sd, core, queryctrl, arg);
+        case VIDIOC_LOG_STATUS:
+                return v4l2_subdev_call(sd, core, log_status);
+        case VIDIOC_G_CHIP_IDENT:
+                return v4l2_subdev_call(sd, core, g_chip_ident, arg);
+        case VIDIOC_INT_S_STANDBY:
+                return v4l2_subdev_call(sd, core, s_standby, *(u32 *)arg);
+        case VIDIOC_INT_RESET:
+                return v4l2_subdev_call(sd, core, reset, *(u32 *)arg);
+        case VIDIOC_INT_S_GPIO:
+                return v4l2_subdev_call(sd, core, s_gpio, *(u32 *)arg);
+        case VIDIOC_INT_INIT:
+                return v4l2_subdev_call(sd, core, init, *(u32 *)arg);
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        case VIDIOC_DBG_G_REGISTER:
+                return v4l2_subdev_call(sd, core, g_register, arg);
+        case VIDIOC_DBG_S_REGISTER:
+                return v4l2_subdev_call(sd, core, s_register, arg);
+#endif
+
+        case VIDIOC_INT_S_TUNER_MODE:
+                return v4l2_subdev_call(sd, tuner, s_mode, *(enum v4l2_tuner_type *)arg);
+        case AUDC_SET_RADIO:
+                return v4l2_subdev_call(sd, tuner, s_radio);
+        case VIDIOC_S_TUNER:
+                return v4l2_subdev_call(sd, tuner, s_tuner, arg);
+        case VIDIOC_G_TUNER:
+                return v4l2_subdev_call(sd, tuner, g_tuner, arg);
+        case VIDIOC_S_STD:
+                return v4l2_subdev_call(sd, tuner, s_std, *(v4l2_std_id *)arg);
+        case VIDIOC_S_FREQUENCY:
+                return v4l2_subdev_call(sd, tuner, s_frequency, arg);
+        case VIDIOC_G_FREQUENCY:
+                return v4l2_subdev_call(sd, tuner, g_frequency, arg);
+        case TUNER_SET_TYPE_ADDR:
+                return v4l2_subdev_call(sd, tuner, s_type_addr, arg);
+        case TUNER_SET_CONFIG:
+                return v4l2_subdev_call(sd, tuner, s_config, arg);
+
+        case VIDIOC_INT_AUDIO_CLOCK_FREQ:
+                return v4l2_subdev_call(sd, audio, s_clock_freq, *(u32 *)arg);
+        case VIDIOC_INT_S_AUDIO_ROUTING:
+                return v4l2_subdev_call(sd, audio, s_routing, arg);
+        case VIDIOC_INT_I2S_CLOCK_FREQ:
+                return v4l2_subdev_call(sd, audio, s_i2s_clock_freq, *(u32 *)arg);
+
+        case VIDIOC_INT_S_VIDEO_ROUTING:
+                return v4l2_subdev_call(sd, video, s_routing, arg);
+        case VIDIOC_INT_S_CRYSTAL_FREQ:
+                return v4l2_subdev_call(sd, video, s_crystal_freq, arg);
+        case VIDIOC_INT_DECODE_VBI_LINE:
+                return v4l2_subdev_call(sd, video, decode_vbi_line, arg);
+        case VIDIOC_INT_S_VBI_DATA:
+                return v4l2_subdev_call(sd, video, s_vbi_data, arg);
+        case VIDIOC_INT_G_VBI_DATA:
+                return v4l2_subdev_call(sd, video, g_vbi_data, arg);
+        case VIDIOC_S_FMT:
+                return v4l2_subdev_call(sd, video, s_fmt, arg);
+        case VIDIOC_G_FMT:
+                return v4l2_subdev_call(sd, video, g_fmt, arg);
+        case VIDIOC_INT_S_STD_OUTPUT:
+                return v4l2_subdev_call(sd, video, s_std_output, *(v4l2_std_id *)arg);
+        case VIDIOC_STREAMON:
+                return v4l2_subdev_call(sd, video, s_stream, 1);
+        case VIDIOC_STREAMOFF:
+                return v4l2_subdev_call(sd, video, s_stream, 0);
+
+        default:
+                return v4l2_subdev_call(sd, core, ioctl, cmd, arg);
+        }
+}
+EXPORT_SYMBOL_GPL(v4l2_subdev_command);