[media] v4l2-events/fh: merge v4l2_events into v4l2_fh

[pandora-kernel.git] / drivers / media / video / vivi.c

diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 2238a61..1b90713 100644 (file)
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -22,7 +22,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/font.h>
-#include <linux/version.h>
 #include <linux/mutex.h>
 #include <linux/videodev2.h>
 #include <linux/kthread.h>
@@ -32,6 +31,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-fh.h>
+#include <media/v4l2-event.h>
 #include <media/v4l2-common.h>
 
 #define VIVI_MODULE_NAME "vivi"
@@ -44,15 +44,12 @@
 #define MAX_WIDTH 1920
 #define MAX_HEIGHT 1200
 
-#define VIVI_MAJOR_VERSION 0
-#define VIVI_MINOR_VERSION 8
-#define VIVI_RELEASE 0
-#define VIVI_VERSION \
-       KERNEL_VERSION(VIVI_MAJOR_VERSION, VIVI_MINOR_VERSION, VIVI_RELEASE)
+#define VIVI_VERSION "0.8.1"
 
 MODULE_DESCRIPTION("Video Technology Magazine Virtual Video Capture Board");
 MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");
 MODULE_LICENSE("Dual BSD/GPL");
+MODULE_VERSION(VIVI_VERSION);
 
 static unsigned video_nr = -1;
 module_param(video_nr, uint, 0644);
@@ -167,6 +164,11 @@ struct vivi_dev {
        struct v4l2_ctrl           *contrast;
        struct v4l2_ctrl           *saturation;
        struct v4l2_ctrl           *hue;
+       struct {
+               /* autogain/gain cluster */
+               struct v4l2_ctrl           *autogain;
+               struct v4l2_ctrl           *gain;
+       };
        struct v4l2_ctrl           *volume;
        struct v4l2_ctrl           *button;
        struct v4l2_ctrl           *boolean;
@@ -457,6 +459,7 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf)
        unsigned ms;
        char str[100];
        int h, line = 1;
+       s32 gain;
 
        if (!vbuf)
                return;
@@ -479,6 +482,7 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf)
                        dev->width, dev->height, dev->input);
        gen_text(dev, vbuf, line++ * 16, 16, str);
 
+       gain = v4l2_ctrl_g_ctrl(dev->gain);
        mutex_lock(&dev->ctrl_handler.lock);
        snprintf(str, sizeof(str), " brightness %3d, contrast %3d, saturation %3d, hue %d ",
                        dev->brightness->cur.val,
@@ -486,7 +490,8 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf)
                        dev->saturation->cur.val,
                        dev->hue->cur.val);
        gen_text(dev, vbuf, line++ * 16, 16, str);
-       snprintf(str, sizeof(str), " volume %3d ", dev->volume->cur.val);
+       snprintf(str, sizeof(str), " autogain %d, gain %3d, volume %3d ",
+                       dev->autogain->cur.val, gain, dev->volume->cur.val);
        gen_text(dev, vbuf, line++ * 16, 16, str);
        snprintf(str, sizeof(str), " int32 %d, int64 %lld ",
                        dev->int32->cur.val,
@@ -812,7 +817,6 @@ static int vidioc_querycap(struct file *file, void  *priv,
        strcpy(cap->driver, "vivi");
        strcpy(cap->card, "vivi");
        strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info));
-       cap->version = VIVI_VERSION;
        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | \
                            V4L2_CAP_READWRITE;
        return 0;
@@ -975,14 +979,37 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
        if (i >= NUM_INPUTS)
                return -EINVAL;
 
+       if (i == dev->input)
+               return 0;
+
        dev->input = i;
        precalculate_bars(dev);
        precalculate_line(dev);
        return 0;
 }
 
+static int vidioc_subscribe_event(struct v4l2_fh *fh,
+                               struct v4l2_event_subscription *sub)
+{
+       switch (sub->type) {
+       case V4L2_EVENT_CTRL:
+               return v4l2_ctrl_subscribe_fh(fh, sub, 0);
+       default:
+               return -EINVAL;
+       }
+}
+
 /* --- controls ---------------------------------------------- */
 
+static int vivi_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+{
+       struct vivi_dev *dev = container_of(ctrl->handler, struct vivi_dev, ctrl_handler);
+
+       if (ctrl == dev->autogain)
+               dev->gain->val = jiffies & 0xff;
+       return 0;
+}
+
 static int vivi_s_ctrl(struct v4l2_ctrl *ctrl)
 {
        struct vivi_dev *dev = container_of(ctrl->handler, struct vivi_dev, ctrl_handler);
@@ -1010,10 +1037,17 @@ static unsigned int
 vivi_poll(struct file *file, struct poll_table_struct *wait)
 {
        struct vivi_dev *dev = video_drvdata(file);
+       struct v4l2_fh *fh = file->private_data;
        struct vb2_queue *q = &dev->vb_vidq;
+       unsigned int res;
 
        dprintk(dev, 1, "%s\n", __func__);
-       return vb2_poll(q, file, wait);
+       res = vb2_poll(q, file, wait);
+       if (v4l2_event_pending(fh))
+               res |= POLLPRI;
+       else
+               poll_wait(file, &fh->wait, wait);
+       return res;
 }
 
 static int vivi_close(struct file *file)
@@ -1045,6 +1079,7 @@ static int vivi_mmap(struct file *file, struct vm_area_struct *vma)
 }
 
 static const struct v4l2_ctrl_ops vivi_ctrl_ops = {
+       .g_volatile_ctrl = vivi_g_volatile_ctrl,
        .s_ctrl = vivi_s_ctrl,
 };
 
@@ -1119,7 +1154,7 @@ static const struct v4l2_ctrl_config vivi_ctrl_string = {
 
 static const struct v4l2_file_operations vivi_fops = {
        .owner          = THIS_MODULE,
-       .open           = v4l2_fh_open,
+       .open           = v4l2_fh_open,
        .release        = vivi_close,
        .read           = vivi_read,
        .poll           = vivi_poll,
@@ -1143,6 +1178,8 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = {
        .vidioc_s_input       = vidioc_s_input,
        .vidioc_streamon      = vidioc_streamon,
        .vidioc_streamoff     = vidioc_streamoff,
+       .vidioc_subscribe_event = vidioc_subscribe_event,
+       .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };
 
 static struct video_device vivi_template = {
@@ -1213,6 +1250,10 @@ static int __init vivi_create_instance(int inst)
                        V4L2_CID_SATURATION, 0, 255, 1, 127);
        dev->hue = v4l2_ctrl_new_std(hdl, &vivi_ctrl_ops,
                        V4L2_CID_HUE, -128, 127, 1, 0);
+       dev->autogain = v4l2_ctrl_new_std(hdl, &vivi_ctrl_ops,
+                       V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+       dev->gain = v4l2_ctrl_new_std(hdl, &vivi_ctrl_ops,
+                       V4L2_CID_GAIN, 0, 255, 1, 100);
        dev->button = v4l2_ctrl_new_custom(hdl, &vivi_ctrl_button, NULL);
        dev->int32 = v4l2_ctrl_new_custom(hdl, &vivi_ctrl_int32, NULL);
        dev->int64 = v4l2_ctrl_new_custom(hdl, &vivi_ctrl_int64, NULL);
@@ -1223,6 +1264,7 @@ static int __init vivi_create_instance(int inst)
                ret = hdl->error;
                goto unreg_dev;
        }
+       v4l2_ctrl_auto_cluster(2, &dev->autogain, 0, true);
        dev->v4l2_dev.ctrl_handler = hdl;
 
        /* initialize locks */
@@ -1325,9 +1367,8 @@ static int __init vivi_init(void)
        }
 
        printk(KERN_INFO "Video Technology Magazine Virtual Video "
-                       "Capture Board ver %u.%u.%u successfully loaded.\n",
-                       (VIVI_VERSION >> 16) & 0xFF, (VIVI_VERSION >> 8) & 0xFF,
-                       VIVI_VERSION & 0xFF);
+                       "Capture Board ver %s successfully loaded.\n",
+                       VIVI_VERSION);
 
        /* n_devs will reflect the actual number of allocated devices */
        n_devs = i;