switching to videobuf2

diff --git a/vdummy.c b/vdummy.c
index 55ed4da..e01eba6 100644 (file)
--- a/vdummy.c
+++ b/vdummy.c
@@ -1,20 +1,22 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
+#include <linux/mutex.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <linux/videodev2.h>
+#include <media/videobuf2-vmalloc.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>
 
+struct buffer {
+       struct vb2_buffer vb;
+       struct buffer *next;
+};
+
 static int init(void);
 static void shutdown(void);
-static int open(struct file *file);
-static int close(struct file *file);
-static ssize_t read(struct file *file, char *ubuf, size_t bufsz, loff_t *offs);
-//static unsigned int poll(struct file *file, struct poll_table_struct *ptab);
 
 static int ioctl_querycap(struct file *file, void *fh, struct v4l2_capability *cap);
 static int ioctl_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *fdesc);
@@ -24,6 +26,14 @@ static int ioctl_get_parm(struct file *file, void *fh, struct v4l2_streamparm *f
 static int ioctl_set_parm(struct file *file, void *fh, struct v4l2_streamparm *fmt);
 static int ioctl_queryctl(struct file *file, void *fh, struct v4l2_queryctrl *ctl);
 
+static int queue_setup(struct vb2_queue *vbq, unsigned int *nbuf,
+               unsigned int *nplanes, unsigned int *sizes, void **alloc_ctx);
+static int buf_prepare(struct vb2_buffer *vb);
+static void buf_queue(struct vb2_buffer *vb);
+static int start_streaming(struct vb2_queue *vbq, unsigned int count);
+static void stop_streaming(struct vb2_queue *vbq);
+
+
 static int update_frame(int xsz, int ysz);
 
 
@@ -34,15 +44,22 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("John Tsiombikas");
 MODULE_DESCRIPTION("v4l2 test module");
 
+static struct mutex mutex;
 static struct video_device *vdev;
 
 static struct v4l2_device v4l2_dev;
 static struct v4l2_file_operations fops;
 static struct v4l2_ioctl_ops iops;
+static struct vb2_queue vbq;
+static struct vb2_ops vbops;
 static int width, height;
 static unsigned char *frame;
 static int frame_size;
 
+static int streaming;
+static struct buffer *buflist;
+static int seqno;
+
 
 static int init(void)
 {
@@ -53,6 +70,32 @@ static int init(void)
                return res;
        }
 
+       mutex_init(&mutex);
+
+       vbops.queue_setup = queue_setup;
+       vbops.buf_prepare = buf_prepare;
+       vbops.buf_queue = buf_queue;
+       vbops.start_streaming = start_streaming;
+       vbops.stop_streaming = stop_streaming;
+       vbops.wait_prepare = vb2_ops_wait_prepare;
+       vbops.wait_finish = vb2_ops_wait_finish;
+
+       vbq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       vbq.io_modes = VB2_MMAP | VB2_READ;
+       vbq.buf_struct_size = sizeof *buflist;
+       vbq.ops = &vbops;
+       vbq.mem_ops = &vb2_vmalloc_memops;
+       vbq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+       vbq.min_buffers_needed = 1;
+       vbq.lock = &mutex;
+       vbq.gfp_flags = GFP_KERNEL;
+
+       if((res = vb2_queue_init(&vbq)) != 0) {
+               printk(KERN_ALERT "vdummy: failed to initialize videobuf2 queue\n");
+               v4l2_device_unregister(&v4l2_dev);
+               return res;
+       }
+
        if(!(vdev = video_device_alloc())) {
                return -ENOMEM;
        }
@@ -64,10 +107,11 @@ static int init(void)
        vdev->v4l2_dev = &v4l2_dev;
 
        fops.owner = THIS_MODULE;
-       fops.open = open;
-       fops.release = close;
-       fops.read = read;
-       //fops.poll = poll;
+       fops.open = v4l2_fh_open;
+       fops.release = vb2_fop_release;
+       fops.read = vb2_fop_read;
+       fops.mmap = vb2_fop_mmap;
+       fops.poll = vb2_fop_poll;
        fops.unlocked_ioctl = video_ioctl2;
 
        iops.vidioc_querycap = ioctl_querycap;
@@ -77,8 +121,25 @@ static int init(void)
        iops.vidioc_g_parm = ioctl_get_parm;
        iops.vidioc_s_parm = ioctl_set_parm;
        iops.vidioc_queryctrl = ioctl_queryctl;
+       iops.vidioc_reqbufs = vb2_ioctl_reqbufs;
+       iops.vidioc_create_bufs = vb2_ioctl_create_bufs;
+       iops.vidioc_querybuf = vb2_ioctl_querybuf;
+       iops.vidioc_qbuf = vb2_ioctl_qbuf;
+       iops.vidioc_dqbuf = vb2_ioctl_dqbuf;
+       iops.vidioc_expbuf = vb2_ioctl_expbuf;
+       iops.vidioc_streamon = vb2_ioctl_streamon;
+       iops.vidioc_streamoff = vb2_ioctl_streamoff;
 
        if((res = video_register_device(vdev, VFL_TYPE_GRABBER, -1)) != 0) {
+               printk(KERN_ALERT "vdummy: failed to register video device\n");
+               v4l2_device_unregister(&v4l2_dev);
+               video_device_release(vdev);
+               return res;
+       }
+
+       if((res = update_frame(640, 480)) != 0) {
+               video_unregister_device(vdev);
+               v4l2_device_unregister(&v4l2_dev);
                video_device_release(vdev);
                return res;
        }
@@ -94,52 +155,12 @@ static void shutdown(void)
        kfree(frame);
 }
 
-static int open(struct file *file)
-{
-       int res;
-       try_module_get(THIS_MODULE);
-       if((res = update_frame(640, 480)) != 0) {
-               return res;
-       }
-       return 0;
-}
-
-static int close(struct file *file)
-{
-       module_put(THIS_MODULE);
-       return 0;
-}
-
-static ssize_t read(struct file *file, char *ubuf, size_t ubufsz, loff_t *offs)
-{
-       int sz = frame_size - *offs;
-
-       if(sz <= 0) return 0;
-       if(ubufsz < sz) sz = ubufsz;
-
-       if(copy_to_user(ubuf, frame + *offs, sz) != 0) {
-               return -EFAULT;
-       }
-
-       *offs += sz;
-       if(*offs >= frame_size) {
-               *offs = 0;
-       }
-       return sz;
-}
-
-/*
-static unsigned int poll(struct file *file, struct poll_table_struct *ptab)
-{
-}
-*/
-
 static int ioctl_querycap(struct file *file, void *fh, struct v4l2_capability *cap)
 {
        strcpy(cap->driver, KBUILD_MODNAME);
        strcpy(cap->card, "dummy v4l2 dev");
        strcpy(cap->bus_info, "nobus");
-       cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;
+       cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
        return 0;
 }
@@ -179,8 +200,6 @@ static int ioctl_set_fmt(struct file *file, void *fh, struct v4l2_format *fmt)
 {
        int res;
 
-       printk(KERN_INFO "ioctl_set_fmt called\n");
-
        if(fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
                return -EINVAL;
        }
@@ -217,18 +236,59 @@ static int ioctl_queryctl(struct file *file, void *fh, struct v4l2_queryctrl *ct
        return -EINVAL;
 }
 
+static int queue_setup(struct vb2_queue *vbq, unsigned int *nbuf,
+               unsigned int *nplanes, unsigned int *sizes, void **alloc_ctx)
+{
+       if(vbq->num_buffers + *nbuf < 2) {
+               *nbuf = 2 - vbq->num_buffers;
+       }
+
+       *nplanes = 1;
+       sizes[0] = frame_size;
+       alloc_ctx[0] = 0;
+       return 0;
+}
+
+static int buf_prepare(struct vb2_buffer *vb)
+{
+       if(vb2_plane_size(vb, 0) < frame_size) {
+               printk(KERN_ALERT "vdummy: buffer too small\n");
+               return -EINVAL;
+       }
+       vb2_set_plane_payload(vb, 0, frame_size);
+       return 0;
+}
+
+static void buf_queue(struct vb2_buffer *vb)
+{
+       memcpy(vb2_plane_vaddr(vb, 0), frame, frame_size);
+       vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
+}
+
+static int start_streaming(struct vb2_queue *vbq, unsigned int count)
+{
+       streaming = 1;
+       seqno = 0;
+       return 0;
+}
+
+static void stop_streaming(struct vb2_queue *vbq)
+{
+       streaming = 0;
+}
+
 static int update_frame(int xsz, int ysz)
 {
        unsigned char *tmp;
        int i, j;
        int new_fsz = xsz * ysz * 3;
 
-       printk(KERN_INFO "update_frame(%d, %d)\n", xsz, ysz);
-
        if(xsz == width && ysz == height) {
                return 0;
        }
 
+       printk(KERN_INFO "vdummy: update_frame(%d, %d)\n", xsz, ysz);
+
        if(!frame || frame_size < new_fsz) {
                if(!(tmp = kmalloc(new_fsz, GFP_KERNEL))) {
                        return -ENOMEM;