diff options
Diffstat (limited to 'linux/drivers/media/video/bttv-vbi.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-vbi.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/video/bttv-vbi.c b/linux/drivers/media/video/bttv-vbi.c index 3f3f24b04..5dcbfd854 100644 --- a/linux/drivers/media/video/bttv-vbi.c +++ b/linux/drivers/media/video/bttv-vbi.c @@ -1,5 +1,5 @@ /* - $Id: bttv-vbi.c,v 1.3 2004/09/15 16:15:24 kraxel Exp $ + $Id: bttv-vbi.c,v 1.4 2004/09/23 13:58:19 kraxel Exp $ bttv - Bt848 frame grabber driver vbi interface @@ -63,10 +63,10 @@ vbi_buffer_risc(struct bttv *btv, struct bttv_buffer *buf, int lines) return 0; } -static int vbi_buffer_setup(struct file *file, +static int vbi_buffer_setup(void *priv, unsigned int *count, unsigned int *size) { - struct bttv_fh *fh = file->private_data; + struct bttv_fh *fh = priv; struct bttv *btv = fh->btv; if (0 == *count) @@ -76,10 +76,10 @@ static int vbi_buffer_setup(struct file *file, return 0; } -static int vbi_buffer_prepare(struct file *file, struct videobuf_buffer *vb, +static int vbi_buffer_prepare(void *priv, struct videobuf_buffer *vb, enum v4l2_field field) { - struct bttv_fh *fh = file->private_data; + struct bttv_fh *fh = priv; struct bttv *btv = fh->btv; struct bttv_buffer *buf = (struct bttv_buffer*)vb; int rc; @@ -107,9 +107,9 @@ static int vbi_buffer_prepare(struct file *file, struct videobuf_buffer *vb, } static void -vbi_buffer_queue(struct file *file, struct videobuf_buffer *vb) +vbi_buffer_queue(void *priv, struct videobuf_buffer *vb) { - struct bttv_fh *fh = file->private_data; + struct bttv_fh *fh = priv; struct bttv *btv = fh->btv; struct bttv_buffer *buf = (struct bttv_buffer*)vb; @@ -122,9 +122,9 @@ vbi_buffer_queue(struct file *file, struct videobuf_buffer *vb) } } -static void vbi_buffer_release(struct file *file, struct videobuf_buffer *vb) +static void vbi_buffer_release(void *priv, struct videobuf_buffer *vb) { - struct bttv_fh *fh = file->private_data; + struct bttv_fh *fh = priv; struct bttv *btv = fh->btv; struct bttv_buffer *buf = (struct bttv_buffer*)vb; |