Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 320150
b: refs/heads/master
c: edbd138
h: refs/heads/master
v: v3
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Jul 6, 2012
1 parent 6fbaf68 commit 76b2b02
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 55 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7bb34c8e42fe2e7cfa0a46db52dc2a79f2ba723a
refs/heads/master: edbd138ed0cae5abe469b61e368d2629815d4c37
89 changes: 37 additions & 52 deletions trunk/drivers/media/video/cx88/cx88-video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -683,25 +683,30 @@ static const struct videobuf_queue_ops cx8800_video_qops = {

/* ------------------------------------------------------------------ */

static struct videobuf_queue* get_queue(struct cx8800_fh *fh)
static struct videobuf_queue *get_queue(struct file *file)
{
switch (fh->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
struct video_device *vdev = video_devdata(file);
struct cx8800_fh *fh = file->private_data;

switch (vdev->vfl_type) {
case VFL_TYPE_GRABBER:
return &fh->vidq;
case V4L2_BUF_TYPE_VBI_CAPTURE:
case VFL_TYPE_VBI:
return &fh->vbiq;
default:
BUG();
return NULL;
}
}

static int get_ressource(struct cx8800_fh *fh)
static int get_resource(struct file *file)
{
switch (fh->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
struct video_device *vdev = video_devdata(file);

switch (vdev->vfl_type) {
case VFL_TYPE_GRABBER:
return RESOURCE_VIDEO;
case V4L2_BUF_TYPE_VBI_CAPTURE:
case VFL_TYPE_VBI:
return RESOURCE_VBI;
default:
BUG();
Expand Down Expand Up @@ -740,8 +745,6 @@ static int video_open(struct file *file)

file->private_data = fh;
fh->dev = dev;
fh->radio = radio;
fh->type = type;
fh->width = 320;
fh->height = 240;
fh->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24);
Expand All @@ -761,7 +764,7 @@ static int video_open(struct file *file)
sizeof(struct cx88_buffer),
fh, NULL);

if (fh->radio) {
if (vdev->vfl_type == VFL_TYPE_RADIO) {
dprintk(1,"video_open: setting radio device\n");
cx_write(MO_GP3_IO, core->board.radio.gpio3);
cx_write(MO_GP0_IO, core->board.radio.gpio0);
Expand Down Expand Up @@ -794,15 +797,16 @@ static int video_open(struct file *file)
static ssize_t
video_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
{
struct video_device *vdev = video_devdata(file);
struct cx8800_fh *fh = file->private_data;

switch (fh->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
switch (vdev->vfl_type) {
case VFL_TYPE_GRABBER:
if (res_locked(fh->dev,RESOURCE_VIDEO))
return -EBUSY;
return videobuf_read_one(&fh->vidq, data, count, ppos,
file->f_flags & O_NONBLOCK);
case V4L2_BUF_TYPE_VBI_CAPTURE:
case VFL_TYPE_VBI:
if (!res_get(fh->dev,fh,RESOURCE_VBI))
return -EBUSY;
return videobuf_read_stream(&fh->vbiq, data, count, ppos, 1,
Expand All @@ -816,11 +820,12 @@ video_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
static unsigned int
video_poll(struct file *file, struct poll_table_struct *wait)
{
struct video_device *vdev = video_devdata(file);
struct cx8800_fh *fh = file->private_data;
struct cx88_buffer *buf;
unsigned int rc = POLLERR;

if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) {
if (vdev->vfl_type == VFL_TYPE_VBI) {
if (!res_get(fh->dev,fh,RESOURCE_VBI))
return POLLERR;
return videobuf_poll_stream(file, &fh->vbiq, wait);
Expand Down Expand Up @@ -894,9 +899,7 @@ static int video_release(struct file *file)
static int
video_mmap(struct file *file, struct vm_area_struct * vma)
{
struct cx8800_fh *fh = file->private_data;

return videobuf_mmap_mapper(get_queue(fh), vma);
return videobuf_mmap_mapper(get_queue(file), vma);
}

/* ------------------------------------------------------------------ */
Expand Down Expand Up @@ -1126,63 +1129,53 @@ static int vidioc_enum_fmt_vid_cap (struct file *file, void *priv,

static int vidioc_reqbufs (struct file *file, void *priv, struct v4l2_requestbuffers *p)
{
struct cx8800_fh *fh = priv;
return (videobuf_reqbufs(get_queue(fh), p));
return videobuf_reqbufs(get_queue(file), p);
}

static int vidioc_querybuf (struct file *file, void *priv, struct v4l2_buffer *p)
{
struct cx8800_fh *fh = priv;
return (videobuf_querybuf(get_queue(fh), p));
return videobuf_querybuf(get_queue(file), p);
}

static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *p)
{
struct cx8800_fh *fh = priv;
return (videobuf_qbuf(get_queue(fh), p));
return videobuf_qbuf(get_queue(file), p);
}

static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *p)
{
struct cx8800_fh *fh = priv;
return (videobuf_dqbuf(get_queue(fh), p,
file->f_flags & O_NONBLOCK));
return videobuf_dqbuf(get_queue(file), p,
file->f_flags & O_NONBLOCK);
}

static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
{
struct video_device *vdev = video_devdata(file);
struct cx8800_fh *fh = priv;
struct cx8800_dev *dev = fh->dev;

/* We should remember that this driver also supports teletext, */
/* so we have to test if the v4l2_buf_type is VBI capture data. */
if (unlikely((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) &&
(fh->type != V4L2_BUF_TYPE_VBI_CAPTURE)))
if ((vdev->vfl_type == VFL_TYPE_GRABBER && i != V4L2_BUF_TYPE_VIDEO_CAPTURE) ||
(vdev->vfl_type == VFL_TYPE_VBI && i != V4L2_BUF_TYPE_VBI_CAPTURE))
return -EINVAL;

if (unlikely(i != fh->type))
return -EINVAL;

if (unlikely(!res_get(dev,fh,get_ressource(fh))))
if (unlikely(!res_get(dev, fh, get_resource(file))))
return -EBUSY;
return videobuf_streamon(get_queue(fh));
return videobuf_streamon(get_queue(file));
}

static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
{
struct video_device *vdev = video_devdata(file);
struct cx8800_fh *fh = priv;
struct cx8800_dev *dev = fh->dev;
int err, res;

if ((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) &&
(fh->type != V4L2_BUF_TYPE_VBI_CAPTURE))
return -EINVAL;

if (i != fh->type)
if ((vdev->vfl_type == VFL_TYPE_GRABBER && i != V4L2_BUF_TYPE_VIDEO_CAPTURE) ||
(vdev->vfl_type == VFL_TYPE_VBI && i != V4L2_BUF_TYPE_VBI_CAPTURE))
return -EINVAL;

res = get_ressource(fh);
err = videobuf_streamoff(get_queue(fh));
res = get_resource(file);
err = videobuf_streamoff(get_queue(file));
if (err < 0)
return err;
res_free(dev,fh,res);
Expand Down Expand Up @@ -1305,8 +1298,6 @@ static int vidioc_g_frequency (struct file *file, void *priv,
if (unlikely(UNSET == core->board.tuner_type))
return -EINVAL;

/* f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; */
f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
f->frequency = core->freq;

call_all(core, tuner, g_frequency, f);
Expand Down Expand Up @@ -1343,13 +1334,7 @@ static int vidioc_s_frequency (struct file *file, void *priv,
struct cx8800_fh *fh = priv;
struct cx88_core *core = fh->dev->core;

if (unlikely(0 == fh->radio && f->type != V4L2_TUNER_ANALOG_TV))
return -EINVAL;
if (unlikely(1 == fh->radio && f->type != V4L2_TUNER_RADIO))
return -EINVAL;

return
cx88_set_freq (core,f);
return cx88_set_freq(core, f);
}

#ifdef CONFIG_VIDEO_ADV_DEBUG
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/media/video/cx88/cx88.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,6 @@ struct cx8802_dev;

struct cx8800_fh {
struct cx8800_dev *dev;
enum v4l2_buf_type type;
int radio;
unsigned int resources;

/* video overlay */
Expand Down

0 comments on commit 76b2b02

Please sign in to comment.