diff options
| author | Gerd Knorr <devnull@localhost> | 2004-09-23 13:58:19 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-09-23 13:58:19 +0000 |
| commit | 2f9202097e4418d085a0d6ef636de1d0b0fb84dd (patch) | |
| tree | 346e618d5502ac1f9abce855416aad2bb0b20a47 /linux/drivers/media/video/saa7134/saa7134-vbi.c | |
| parent | 953f8692136acd6aa9201f9388697a7005756894 (diff) | |
| download | mediapointer-dvb-s2-2f9202097e4418d085a0d6ef636de1d0b0fb84dd.tar.gz mediapointer-dvb-s2-2f9202097e4418d085a0d6ef636de1d0b0fb84dd.tar.bz2 | |
- make video-bufg don't touch struct file any more, pass through
a void ptr instead of a file ptr everythere.
- add cx22702 fe driver,
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-vbi.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-vbi.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-vbi.c b/linux/drivers/media/video/saa7134/saa7134-vbi.c index 01f77e2cc..312da9bf7 100644 --- a/linux/drivers/media/video/saa7134/saa7134-vbi.c +++ b/linux/drivers/media/video/saa7134/saa7134-vbi.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-vbi.c,v 1.2 2004/09/15 16:15:24 kraxel Exp $ + * $Id: saa7134-vbi.c,v 1.3 2004/09/23 13:58:19 kraxel Exp $ * * device driver for philips saa7134 based TV cards * video4linux video interface @@ -115,10 +115,10 @@ static int buffer_activate(struct saa7134_dev *dev, return 0; } -static int buffer_prepare(struct file *file, struct videobuf_buffer *vb, +static int buffer_prepare(void *priv, struct videobuf_buffer *vb, enum v4l2_field field) { - struct saa7134_fh *fh = file->private_data; + struct saa7134_fh *fh = priv; struct saa7134_dev *dev = fh->dev; struct saa7134_buf *buf = (struct saa7134_buf *)vb; struct saa7134_tvnorm *norm = dev->tvnorm; @@ -169,9 +169,9 @@ static int buffer_prepare(struct file *file, struct videobuf_buffer *vb, } static int -buffer_setup(struct file *file, unsigned int *count, unsigned int *size) +buffer_setup(void *priv, unsigned int *count, unsigned int *size) { - struct saa7134_fh *fh = file->private_data; + struct saa7134_fh *fh = priv; struct saa7134_dev *dev = fh->dev; int llength,lines; @@ -190,18 +190,18 @@ buffer_setup(struct file *file, unsigned int *count, unsigned int *size) return 0; } -static void buffer_queue(struct file *file, struct videobuf_buffer *vb) +static void buffer_queue(void *priv, struct videobuf_buffer *vb) { - struct saa7134_fh *fh = file->private_data; + struct saa7134_fh *fh = priv; struct saa7134_dev *dev = fh->dev; struct saa7134_buf *buf = (struct saa7134_buf *)vb; saa7134_buffer_queue(dev,&dev->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 saa7134_fh *fh = file->private_data; + struct saa7134_fh *fh = priv; struct saa7134_dev *dev = fh->dev; struct saa7134_buf *buf = (struct saa7134_buf *)vb; |