summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bt8xx/bttvp.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-27 23:20:58 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-12-27 23:20:58 -0200
commit7ff64ceecf2b47b2b67842f76b5005dfcfc43dc7 (patch)
tree328ef45c0989f8b63b24479d3334abf2b26cf2b5 /linux/drivers/media/video/bt8xx/bttvp.h
parentfb9fac6bdf1533fb63d345d2d862a017dc210d64 (diff)
downloadmediapointer-dvb-s2-7ff64ceecf2b47b2b67842f76b5005dfcfc43dc7.tar.gz
mediapointer-dvb-s2-7ff64ceecf2b47b2b67842f76b5005dfcfc43dc7.tar.bz2
Converted bttv to use video_ioctl2
From: Douglas Schilling Landgraf <dougsland@gmail.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttvp.h')
-rw-r--r--linux/drivers/media/video/bt8xx/bttvp.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h
index b8d3e59a8..2ed762521 100644
--- a/linux/drivers/media/video/bt8xx/bttvp.h
+++ b/linux/drivers/media/video/bt8xx/bttvp.h
@@ -93,6 +93,11 @@
#define clamp(x, low, high) min (max (low, x), high)
+#define BTTV_NORMS (\
+ V4L2_STD_PAL | V4L2_STD_PAL_N | \
+ V4L2_STD_PAL_Nc | V4L2_STD_SECAM | \
+ V4L2_STD_NTSC | V4L2_STD_PAL_M | \
+ V4L2_STD_PAL_60)
/* ---------------------------------------------------------- */
struct bttv_tvnorm {
@@ -261,9 +266,9 @@ int bttv_overlay_risc(struct bttv *btv, struct bttv_overlay *ov,
/* ---------------------------------------------------------- */
/* bttv-vbi.c */
-int bttv_vbi_try_fmt(struct bttv_fh *fh, struct v4l2_vbi_format *f);
-void bttv_vbi_get_fmt(struct bttv_fh *fh, struct v4l2_vbi_format *f);
-int bttv_vbi_set_fmt(struct bttv_fh *fh, struct v4l2_vbi_format *f);
+int vidioc_try_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f);
+int vidioc_g_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f);
+int vidioc_s_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f);
extern struct videobuf_queue_ops bttv_vbi_qops;