projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (5097): Convert cx8800 driver to video_ioctl2 handler
[deliverable/linux.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-vbi.c
diff --git
a/drivers/media/video/cx88/cx88-vbi.c
b/drivers/media/video/cx88/cx88-vbi.c
index aa2a69770098cf48b085d9f35c79f154ec20c9b6..b6b968851d7148e4847283674459bd5cd9685a77 100644
(file)
--- a/
drivers/media/video/cx88/cx88-vbi.c
+++ b/
drivers/media/video/cx88/cx88-vbi.c
@@
-21,9
+21,11
@@
MODULE_PARM_DESC(vbi_debug,"enable debug messages [vbi]");
/* ------------------------------------------------------------------ */
/* ------------------------------------------------------------------ */
-void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f)
+int cx8800_vbi_fmt (struct file *file, void *priv,
+ struct v4l2_format *f)
{
{
- memset(&f->fmt.vbi,0,sizeof(f->fmt.vbi));
+ struct cx8800_fh *fh = priv;
+ struct cx8800_dev *dev = fh->dev;
f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;
f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;
f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
@@
-43,6
+45,7
@@
void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f)
f->fmt.vbi.start[0] = 7 -1;
f->fmt.vbi.start[1] = 319 -1;
}
f->fmt.vbi.start[0] = 7 -1;
f->fmt.vbi.start[1] = 319 -1;
}
+ return 0;
}
static int cx8800_start_vbi_dma(struct cx8800_dev *dev,
}
static int cx8800_start_vbi_dma(struct cx8800_dev *dev,
This page took
0.027457 seconds
and
5
git commands to generate.