diff options
| author | Michael Hunold <devnull@localhost> | 2004-10-25 13:41:25 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2004-10-25 13:41:25 +0000 |
| commit | 413458cbd323574f947dd84d8a0183fbe63ac412 (patch) | |
| tree | 26b170209ab5bbdf6cad2cbe61d4b9836c22e116 /linux/drivers/media/common/saa7146_vbi.c | |
| parent | d3655c86e2e0515ec4e5264fb738da075eb6d05f (diff) | |
| download | mediapointer-dvb-s2-413458cbd323574f947dd84d8a0183fbe63ac412.tar.gz mediapointer-dvb-s2-413458cbd323574f947dd84d8a0183fbe63ac412.tar.bz2 | |
- follow latest changes in 2.6.10-rc1 regarding video-buf. this change
breaks compilation with older kernels for dvb-ttpci
Diffstat (limited to 'linux/drivers/media/common/saa7146_vbi.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_vbi.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/linux/drivers/media/common/saa7146_vbi.c b/linux/drivers/media/common/saa7146_vbi.c index e4cdfc421..48afdd0c5 100644 --- a/linux/drivers/media/common/saa7146_vbi.c +++ b/linux/drivers/media/common/saa7146_vbi.c @@ -214,8 +214,9 @@ static int buffer_activate(struct saa7146_dev *dev, return 0; } -static int buffer_prepare(struct file *file, struct videobuf_buffer *vb,enum v4l2_field field) +static int buffer_prepare(void *priv, struct videobuf_buffer *vb,enum v4l2_field field) { + struct file *file = priv; struct saa7146_fh *fh = file->private_data; struct saa7146_dev *dev = fh->dev; struct saa7146_buf *buf = (struct saa7146_buf *)vb; @@ -265,7 +266,7 @@ static int buffer_prepare(struct file *file, struct videobuf_buffer *vb,enum v4l return err; } -static int buffer_setup(struct file *file, unsigned int *count, unsigned int *size) +static int buffer_setup(void *priv, unsigned int *count, unsigned int *size) { int llength,lines; @@ -280,8 +281,9 @@ static int buffer_setup(struct file *file, unsigned int *count, unsigned int *si return 0; } -static void buffer_queue(struct file *file, struct videobuf_buffer *vb) +static void buffer_queue(void *priv, struct videobuf_buffer *vb) { + struct file *file = priv; struct saa7146_fh *fh = file->private_data; struct saa7146_dev *dev = fh->dev; struct saa7146_vv *vv = dev->vv_data; @@ -291,8 +293,9 @@ static void buffer_queue(struct file *file, struct videobuf_buffer *vb) saa7146_buffer_queue(dev,&vv->vbi_q,buf); } -static void buffer_release(struct file *file, struct videobuf_buffer *vb) +static void buffer_release(void *priv, struct videobuf_buffer *vb) { + struct file *file = priv; struct saa7146_fh *fh = file->private_data; struct saa7146_dev *dev = fh->dev; struct saa7146_buf *buf = (struct saa7146_buf *)vb; @@ -481,7 +484,8 @@ static ssize_t vbi_read(struct file *file, char __user *data, size_t count, loff } mod_timer(&fh->vbi_read_timeout, jiffies+BUFFER_TIMEOUT); - ret = videobuf_read_stream(file, &fh->vbi_q, data, count, ppos, 1); + ret = videobuf_read_stream(file, &fh->vbi_q, data, count, ppos, 1, + file->f_flags & O_NONBLOCK); /* printk("BASE_ODD3: 0x%08x\n", saa7146_read(dev, BASE_ODD3)); printk("BASE_EVEN3: 0x%08x\n", saa7146_read(dev, BASE_EVEN3)); |