diff options
Diffstat (limited to 'include/media/v4l2-dev.h')
-rw-r--r-- | include/media/v4l2-dev.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 0a88d1d17d30..e36faab8459b 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
@@ -25,6 +25,7 @@ | |||
25 | #define VFL_TYPE_MAX 4 | 25 | #define VFL_TYPE_MAX 4 |
26 | 26 | ||
27 | struct v4l2_ioctl_callbacks; | 27 | struct v4l2_ioctl_callbacks; |
28 | struct video_device; | ||
28 | struct v4l2_device; | 29 | struct v4l2_device; |
29 | 30 | ||
30 | /* Flag to mark the video_device struct as unregistered. | 31 | /* Flag to mark the video_device struct as unregistered. |
@@ -32,6 +33,18 @@ struct v4l2_device; | |||
32 | device access. It is set by video_unregister_device. */ | 33 | device access. It is set by video_unregister_device. */ |
33 | #define V4L2_FL_UNREGISTERED (0) | 34 | #define V4L2_FL_UNREGISTERED (0) |
34 | 35 | ||
36 | struct v4l2_file_operations { | ||
37 | struct module *owner; | ||
38 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); | ||
39 | ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); | ||
40 | unsigned int (*poll) (struct file *, struct poll_table_struct *); | ||
41 | long (*ioctl) (struct file *, unsigned int, unsigned long); | ||
42 | long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); | ||
43 | int (*mmap) (struct file *, struct vm_area_struct *); | ||
44 | int (*open) (struct file *); | ||
45 | int (*release) (struct file *); | ||
46 | }; | ||
47 | |||
35 | /* | 48 | /* |
36 | * Newer version of video_device, handled by videodev2.c | 49 | * Newer version of video_device, handled by videodev2.c |
37 | * This version moves redundant code from video device code to | 50 | * This version moves redundant code from video device code to |
@@ -41,7 +54,7 @@ struct v4l2_device; | |||
41 | struct video_device | 54 | struct video_device |
42 | { | 55 | { |
43 | /* device ops */ | 56 | /* device ops */ |
44 | const struct file_operations *fops; | 57 | const struct v4l2_file_operations *fops; |
45 | 58 | ||
46 | /* sysfs */ | 59 | /* sysfs */ |
47 | struct device dev; /* v4l device */ | 60 | struct device dev; /* v4l device */ |