diff options
Diffstat (limited to 'include/media/v4l2-ioctl.h')
-rw-r--r-- | include/media/v4l2-ioctl.h | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h index 06daa6e8e051..67df37542c68 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h | |||
@@ -14,12 +14,7 @@ | |||
14 | #include <linux/device.h> | 14 | #include <linux/device.h> |
15 | #include <linux/mutex.h> | 15 | #include <linux/mutex.h> |
16 | #include <linux/compiler.h> /* need __user */ | 16 | #include <linux/compiler.h> /* need __user */ |
17 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
18 | #define __MIN_V4L1 | ||
19 | #include <linux/videodev.h> | ||
20 | #else | ||
21 | #include <linux/videodev2.h> | 17 | #include <linux/videodev2.h> |
22 | #endif | ||
23 | 18 | ||
24 | struct v4l2_fh; | 19 | struct v4l2_fh; |
25 | 20 | ||
@@ -113,10 +108,6 @@ struct v4l2_ioctl_ops { | |||
113 | 108 | ||
114 | 109 | ||
115 | int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i); | 110 | int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i); |
116 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
117 | /* buffer type is struct vidio_mbuf * */ | ||
118 | int (*vidiocgmbuf) (struct file *file, void *fh, struct video_mbuf *p); | ||
119 | #endif | ||
120 | int (*vidioc_g_fbuf) (struct file *file, void *fh, | 111 | int (*vidioc_g_fbuf) (struct file *file, void *fh, |
121 | struct v4l2_framebuffer *a); | 112 | struct v4l2_framebuffer *a); |
122 | int (*vidioc_s_fbuf) (struct file *file, void *fh, | 113 | int (*vidioc_s_fbuf) (struct file *file, void *fh, |
@@ -300,22 +291,15 @@ extern void v4l_printk_ioctl(unsigned int cmd); | |||
300 | extern const char *v4l2_field_names[]; | 291 | extern const char *v4l2_field_names[]; |
301 | extern const char *v4l2_type_names[]; | 292 | extern const char *v4l2_type_names[]; |
302 | 293 | ||
303 | /* Compatibility layer interface -- v4l1-compat module */ | ||
304 | typedef long (*v4l2_kioctl)(struct file *file, | ||
305 | unsigned int cmd, void *arg); | ||
306 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
307 | long v4l_compat_translate_ioctl(struct file *file, | ||
308 | int cmd, void *arg, v4l2_kioctl driver_ioctl); | ||
309 | #else | ||
310 | #define v4l_compat_translate_ioctl(file, cmd, arg, ioctl) (-EINVAL) | ||
311 | #endif | ||
312 | |||
313 | #ifdef CONFIG_COMPAT | 294 | #ifdef CONFIG_COMPAT |
314 | /* 32 Bits compatibility layer for 64 bits processors */ | 295 | /* 32 Bits compatibility layer for 64 bits processors */ |
315 | extern long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, | 296 | extern long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, |
316 | unsigned long arg); | 297 | unsigned long arg); |
317 | #endif | 298 | #endif |
318 | 299 | ||
300 | typedef long (*v4l2_kioctl)(struct file *file, | ||
301 | unsigned int cmd, void *arg); | ||
302 | |||
319 | /* Include support for obsoleted stuff */ | 303 | /* Include support for obsoleted stuff */ |
320 | extern long video_usercopy(struct file *file, unsigned int cmd, | 304 | extern long video_usercopy(struct file *file, unsigned int cmd, |
321 | unsigned long arg, v4l2_kioctl func); | 305 | unsigned long arg, v4l2_kioctl func); |