diff options
Diffstat (limited to 'include/media/v4l2-ioctl.h')
-rw-r--r-- | include/media/v4l2-ioctl.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h index 4118ad1324c9..931652f0e2af 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h | |||
@@ -132,7 +132,7 @@ struct v4l2_ioctl_ops { | |||
132 | ENUMSTD is handled by videodev.c | 132 | ENUMSTD is handled by videodev.c |
133 | */ | 133 | */ |
134 | int (*vidioc_g_std) (struct file *file, void *fh, v4l2_std_id *norm); | 134 | int (*vidioc_g_std) (struct file *file, void *fh, v4l2_std_id *norm); |
135 | int (*vidioc_s_std) (struct file *file, void *fh, v4l2_std_id *norm); | 135 | int (*vidioc_s_std) (struct file *file, void *fh, v4l2_std_id norm); |
136 | int (*vidioc_querystd) (struct file *file, void *fh, v4l2_std_id *a); | 136 | int (*vidioc_querystd) (struct file *file, void *fh, v4l2_std_id *a); |
137 | 137 | ||
138 | /* Input handling */ | 138 | /* Input handling */ |
@@ -219,11 +219,11 @@ struct v4l2_ioctl_ops { | |||
219 | int (*vidioc_g_tuner) (struct file *file, void *fh, | 219 | int (*vidioc_g_tuner) (struct file *file, void *fh, |
220 | struct v4l2_tuner *a); | 220 | struct v4l2_tuner *a); |
221 | int (*vidioc_s_tuner) (struct file *file, void *fh, | 221 | int (*vidioc_s_tuner) (struct file *file, void *fh, |
222 | struct v4l2_tuner *a); | 222 | const struct v4l2_tuner *a); |
223 | int (*vidioc_g_frequency) (struct file *file, void *fh, | 223 | int (*vidioc_g_frequency) (struct file *file, void *fh, |
224 | struct v4l2_frequency *a); | 224 | struct v4l2_frequency *a); |
225 | int (*vidioc_s_frequency) (struct file *file, void *fh, | 225 | int (*vidioc_s_frequency) (struct file *file, void *fh, |
226 | struct v4l2_frequency *a); | 226 | const struct v4l2_frequency *a); |
227 | int (*vidioc_enum_freq_bands) (struct file *file, void *fh, | 227 | int (*vidioc_enum_freq_bands) (struct file *file, void *fh, |
228 | struct v4l2_frequency_band *band); | 228 | struct v4l2_frequency_band *band); |
229 | 229 | ||
@@ -242,7 +242,10 @@ struct v4l2_ioctl_ops { | |||
242 | int (*vidioc_g_register) (struct file *file, void *fh, | 242 | int (*vidioc_g_register) (struct file *file, void *fh, |
243 | struct v4l2_dbg_register *reg); | 243 | struct v4l2_dbg_register *reg); |
244 | int (*vidioc_s_register) (struct file *file, void *fh, | 244 | int (*vidioc_s_register) (struct file *file, void *fh, |
245 | struct v4l2_dbg_register *reg); | 245 | const struct v4l2_dbg_register *reg); |
246 | |||
247 | int (*vidioc_g_chip_info) (struct file *file, void *fh, | ||
248 | struct v4l2_dbg_chip_info *chip); | ||
246 | #endif | 249 | #endif |
247 | int (*vidioc_g_chip_ident) (struct file *file, void *fh, | 250 | int (*vidioc_g_chip_ident) (struct file *file, void *fh, |
248 | struct v4l2_dbg_chip_ident *chip); | 251 | struct v4l2_dbg_chip_ident *chip); |
@@ -254,15 +257,6 @@ struct v4l2_ioctl_ops { | |||
254 | struct v4l2_frmivalenum *fival); | 257 | struct v4l2_frmivalenum *fival); |
255 | 258 | ||
256 | /* DV Timings IOCTLs */ | 259 | /* DV Timings IOCTLs */ |
257 | int (*vidioc_enum_dv_presets) (struct file *file, void *fh, | ||
258 | struct v4l2_dv_enum_preset *preset); | ||
259 | |||
260 | int (*vidioc_s_dv_preset) (struct file *file, void *fh, | ||
261 | struct v4l2_dv_preset *preset); | ||
262 | int (*vidioc_g_dv_preset) (struct file *file, void *fh, | ||
263 | struct v4l2_dv_preset *preset); | ||
264 | int (*vidioc_query_dv_preset) (struct file *file, void *fh, | ||
265 | struct v4l2_dv_preset *qpreset); | ||
266 | int (*vidioc_s_dv_timings) (struct file *file, void *fh, | 260 | int (*vidioc_s_dv_timings) (struct file *file, void *fh, |
267 | struct v4l2_dv_timings *timings); | 261 | struct v4l2_dv_timings *timings); |
268 | int (*vidioc_g_dv_timings) (struct file *file, void *fh, | 262 | int (*vidioc_g_dv_timings) (struct file *file, void *fh, |
@@ -281,7 +275,7 @@ struct v4l2_ioctl_ops { | |||
281 | 275 | ||
282 | /* For other private ioctls */ | 276 | /* For other private ioctls */ |
283 | long (*vidioc_default) (struct file *file, void *fh, | 277 | long (*vidioc_default) (struct file *file, void *fh, |
284 | bool valid_prio, int cmd, void *arg); | 278 | bool valid_prio, unsigned int cmd, void *arg); |
285 | }; | 279 | }; |
286 | 280 | ||
287 | 281 | ||