Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 261378
b: refs/heads/master
c: c7a52f8
h: refs/heads/master
v: v3
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent 6a2d84f commit 7c302b5
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 85724983c4d212c24116d45f6585a1c4ff845dd3
refs/heads/master: c7a52f8dced9ee325b8e3a16a5ac07d191fc3d9b
28 changes: 26 additions & 2 deletions trunk/drivers/media/video/vivi.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,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"
Expand Down Expand Up @@ -978,12 +979,26 @@ 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)
Expand Down Expand Up @@ -1022,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->events->wait, wait);
return res;
}

static int vivi_close(struct file *file)
Expand Down Expand Up @@ -1132,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,
Expand All @@ -1156,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 = {
Expand Down

0 comments on commit 7c302b5

Please sign in to comment.