V4L/DVB (7948): videodev: add missing vidioc_try_fmt_sliced_vbi_output and VIDIOC_ENU...

[~andy/linux] / include / media / v4l2-dev.h

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 8a40f481d8993c1a7cc12bf221232b68f27a9707..f14181fae6ce8a8f6c3a81382f4f82ce1107c67f 100644 (file)
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -132,6 +132,8 @@ struct video_device
                                            struct v4l2_fmtdesc *f);
        int (*vidioc_enum_fmt_vbi_output)  (struct file *file, void *fh,
                                            struct v4l2_fmtdesc *f);
+       int (*vidioc_enum_fmt_sliced_vbi_output)  (struct file *file, void *fh,
+                                           struct v4l2_fmtdesc *f);
        int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,
                                            struct v4l2_fmtdesc *f);
 
@@ -144,6 +146,8 @@ struct video_device
                                        struct v4l2_format *f);
        int (*vidioc_g_fmt_vbi_output) (struct file *file, void *fh,
                                        struct v4l2_format *f);
+       int (*vidioc_g_fmt_sliced_vbi_output) (struct file *file, void *fh,
+                                       struct v4l2_format *f);
        int (*vidioc_g_fmt_vbi_capture)(struct file *file, void *fh,
                                        struct v4l2_format *f);
        int (*vidioc_g_fmt_video_output)(struct file *file, void *fh,
@@ -163,6 +167,8 @@ struct video_device
                                        struct v4l2_format *f);
        int (*vidioc_s_fmt_vbi_output) (struct file *file, void *fh,
                                        struct v4l2_format *f);
+       int (*vidioc_s_fmt_sliced_vbi_output) (struct file *file, void *fh,
+                                       struct v4l2_format *f);
        int (*vidioc_s_fmt_vbi_capture)(struct file *file, void *fh,
                                        struct v4l2_format *f);
        int (*vidioc_s_fmt_video_output)(struct file *file, void *fh,
@@ -181,6 +187,8 @@ struct video_device
                                          struct v4l2_format *f);
        int (*vidioc_try_fmt_vbi_output) (struct file *file, void *fh,
                                          struct v4l2_format *f);
+       int (*vidioc_try_fmt_sliced_vbi_output) (struct file *file, void *fh,
+                                         struct v4l2_format *f);
        int (*vidioc_try_fmt_vbi_capture)(struct file *file, void *fh,
                                          struct v4l2_format *f);
        int (*vidioc_try_fmt_video_output)(struct file *file, void *fh,
@@ -225,7 +233,7 @@ struct video_device
        int (*vidioc_s_input)   (struct file *file, void *fh, unsigned int i);
 
                /* Output handling */
-       int (*vidioc_enumoutput) (struct file *file, void *fh,
+       int (*vidioc_enum_output) (struct file *file, void *fh,
                                  struct v4l2_output *a);
        int (*vidioc_g_output)   (struct file *file, void *fh, unsigned int *i);
        int (*vidioc_s_output)   (struct file *file, void *fh, unsigned int i);