X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=vdummy;a=blobdiff_plain;f=vdummy.c;h=240d4f8c194dc5e9379374110e73ba3c08b48b2d;hp=565a6b86e05597bfeecfc1434efa201efaa298d6;hb=refs%2Fheads%2Fmaster;hpb=067acb6f8534df3219afd536d05237cc8ef495c0

diff --git a/vdummy.c b/vdummy.c
index 565a6b8..240d4f8 100644
--- a/vdummy.c
+++ b/vdummy.c
@@ -5,9 +5,9 @@
 #include <linux/slab.h>
 #include <linux/hrtimer.h>
 #include <linux/ktime.h>
+#include <linux/version.h>
 #include <asm/uaccess.h>
 #include <linux/videodev2.h>
-#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
@@ -25,6 +25,7 @@ static void shutdown(void);
 
 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);
+static int ioctl_enum_framesz(struct file *file, void *fh, struct v4l2_frmsizeenum *fsz);
 static int ioctl_get_fmt(struct file *file, void *fh, struct v4l2_format *fmt);
 static int ioctl_set_fmt(struct file *file, void *fh, struct v4l2_format *fmt);
 static int ioctl_try_fmt(struct file *file, void *fh, struct v4l2_format *fmt);
@@ -32,8 +33,15 @@ 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);
 
+/* TODO find out exact version where this switched over */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+#define ALLOC_CTX_TYPE	void
+#else
+#define ALLOC_CTX_TYPE	struct device
+#endif
+
 static int queue_setup(struct vb2_queue *vbq, unsigned int *nbuf,
-		unsigned int *nplanes, unsigned int *sizes, void **alloc_ctx);
+		unsigned int *nplanes, unsigned int *sizes, ALLOC_CTX_TYPE **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);
@@ -132,6 +140,7 @@ static int init(void)
 
 	iops.vidioc_querycap = ioctl_querycap;
 	iops.vidioc_enum_fmt_vid_cap = ioctl_enum_fmt;
+	iops.vidioc_enum_framesizes = ioctl_enum_framesz;
 	iops.vidioc_g_fmt_vid_cap = ioctl_get_fmt;
 	iops.vidioc_s_fmt_vid_cap = ioctl_set_fmt;
 	iops.vidioc_try_fmt_vid_cap = ioctl_try_fmt;
@@ -200,6 +209,18 @@ static int ioctl_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *fdes
 	return 0;
 }
 
+static int ioctl_enum_framesz(struct file *file, void *fh, struct v4l2_frmsizeenum *fsz)
+{
+	if(fsz->index != 0) {
+		return -EINVAL;
+	}
+	fsz->type = V4L2_FRMSIZE_TYPE_CONTINUOUS;
+	fsz->stepwise.min_width = fsz->stepwise.min_height = 1;
+	fsz->stepwise.max_width = fsz->stepwise.max_height = 8192;
+	fsz->stepwise.step_width = fsz->stepwise.step_height = 1;
+	return 0;
+}
+
 static int ioctl_get_fmt(struct file *file, void *fh, struct v4l2_format *fmt)
 {
 	if(fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
@@ -288,7 +309,7 @@ static int ioctl_queryctl(struct file *file, void *fh, struct v4l2_queryctrl *ct
 }
 
 static int queue_setup(struct vb2_queue *vbq, unsigned int *nbuf,
-		unsigned int *nplanes, unsigned int *sizes, void **alloc_ctx)
+		unsigned int *nplanes, unsigned int *sizes, ALLOC_CTX_TYPE **alloc_ctx)
 {
 	if(vbq->num_buffers + *nbuf < 2) {
 		*nbuf = 2 - vbq->num_buffers;
@@ -411,19 +432,19 @@ static int update_frame(int xsz, int ysz)
 static int gen_frame(void)
 {
 	struct buffer *buf = 0;
+	unsigned long flags;
 
 	printk(KERN_INFO "vdummy: gen_frame\n");
 
-	spin_lock(&blist_lock);
+	spin_lock_irqsave(&blist_lock, flags);
 	if(buflist) {
 		buf = buflist;
 		buflist = buflist->next;
 		if(!buflist) buflist_tail = 0;
 	}
-	spin_unlock(&blist_lock);
+	spin_unlock_irqrestore(&blist_lock, flags);
 
 	if(buf) {
-		mutex_lock(&mutex);
 		memcpy(vb2_plane_vaddr(&buf->vb.vb2_buf, 0), frame, frame_size);
 
 		buf->vb.vb2_buf.timestamp = ktime_get_ns();
@@ -433,7 +454,6 @@ static int gen_frame(void)
 		buf->vb.field = V4L2_FIELD_NONE;
 		vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
 		vb2_set_plane_payload(&buf->vb.vb2_buf, 0, frame_size);
-		mutex_unlock(&mutex);
 	}
 	return 0;
 }