aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-dev.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 8a40f481d899..f14181fae6ce 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -132,6 +132,8 @@ struct video_device
132 struct v4l2_fmtdesc *f); 132 struct v4l2_fmtdesc *f);
133 int (*vidioc_enum_fmt_vbi_output) (struct file *file, void *fh, 133 int (*vidioc_enum_fmt_vbi_output) (struct file *file, void *fh,
134 struct v4l2_fmtdesc *f); 134 struct v4l2_fmtdesc *f);
135 int (*vidioc_enum_fmt_sliced_vbi_output) (struct file *file, void *fh,
136 struct v4l2_fmtdesc *f);
135 int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh, 137 int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,
136 struct v4l2_fmtdesc *f); 138 struct v4l2_fmtdesc *f);
137 139
@@ -144,6 +146,8 @@ struct video_device
144 struct v4l2_format *f); 146 struct v4l2_format *f);
145 int (*vidioc_g_fmt_vbi_output) (struct file *file, void *fh, 147 int (*vidioc_g_fmt_vbi_output) (struct file *file, void *fh,
146 struct v4l2_format *f); 148 struct v4l2_format *f);
149 int (*vidioc_g_fmt_sliced_vbi_output) (struct file *file, void *fh,
150 struct v4l2_format *f);
147 int (*vidioc_g_fmt_vbi_capture)(struct file *file, void *fh, 151 int (*vidioc_g_fmt_vbi_capture)(struct file *file, void *fh,
148 struct v4l2_format *f); 152 struct v4l2_format *f);
149 int (*vidioc_g_fmt_video_output)(struct file *file, void *fh, 153 int (*vidioc_g_fmt_video_output)(struct file *file, void *fh,
@@ -163,6 +167,8 @@ struct video_device
163 struct v4l2_format *f); 167 struct v4l2_format *f);
164 int (*vidioc_s_fmt_vbi_output) (struct file *file, void *fh, 168 int (*vidioc_s_fmt_vbi_output) (struct file *file, void *fh,
165 struct v4l2_format *f); 169 struct v4l2_format *f);
170 int (*vidioc_s_fmt_sliced_vbi_output) (struct file *file, void *fh,
171 struct v4l2_format *f);
166 int (*vidioc_s_fmt_vbi_capture)(struct file *file, void *fh, 172 int (*vidioc_s_fmt_vbi_capture)(struct file *file, void *fh,
167 struct v4l2_format *f); 173 struct v4l2_format *f);
168 int (*vidioc_s_fmt_video_output)(struct file *file, void *fh, 174 int (*vidioc_s_fmt_video_output)(struct file *file, void *fh,
@@ -181,6 +187,8 @@ struct video_device
181 struct v4l2_format *f); 187 struct v4l2_format *f);
182 int (*vidioc_try_fmt_vbi_output) (struct file *file, void *fh, 188 int (*vidioc_try_fmt_vbi_output) (struct file *file, void *fh,
183 struct v4l2_format *f); 189 struct v4l2_format *f);
190 int (*vidioc_try_fmt_sliced_vbi_output) (struct file *file, void *fh,
191 struct v4l2_format *f);
184 int (*vidioc_try_fmt_vbi_capture)(struct file *file, void *fh, 192 int (*vidioc_try_fmt_vbi_capture)(struct file *file, void *fh,
185 struct v4l2_format *f); 193 struct v4l2_format *f);
186 int (*vidioc_try_fmt_video_output)(struct file *file, void *fh, 194 int (*vidioc_try_fmt_video_output)(struct file *file, void *fh,
@@ -225,7 +233,7 @@ struct video_device
225 int (*vidioc_s_input) (struct file *file, void *fh, unsigned int i); 233 int (*vidioc_s_input) (struct file *file, void *fh, unsigned int i);
226 234
227 /* Output handling */ 235 /* Output handling */
228 int (*vidioc_enumoutput) (struct file *file, void *fh, 236 int (*vidioc_enum_output) (struct file *file, void *fh,
229 struct v4l2_output *a); 237 struct v4l2_output *a);
230 int (*vidioc_g_output) (struct file *file, void *fh, unsigned int *i); 238 int (*vidioc_g_output) (struct file *file, void *fh, unsigned int *i);
231 int (*vidioc_s_output) (struct file *file, void *fh, unsigned int i); 239 int (*vidioc_s_output) (struct file *file, void *fh, unsigned int i);