diff options
Diffstat (limited to 'include/media/v4l2-fh.h')
-rw-r--r-- | include/media/v4l2-fh.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/media/v4l2-fh.h b/include/media/v4l2-fh.h index 0206aa55be2..52513c225c1 100644 --- a/include/media/v4l2-fh.h +++ b/include/media/v4l2-fh.h | |||
@@ -29,13 +29,20 @@ | |||
29 | #include <linux/list.h> | 29 | #include <linux/list.h> |
30 | 30 | ||
31 | struct video_device; | 31 | struct video_device; |
32 | struct v4l2_events; | 32 | struct v4l2_ctrl_handler; |
33 | 33 | ||
34 | struct v4l2_fh { | 34 | struct v4l2_fh { |
35 | struct list_head list; | 35 | struct list_head list; |
36 | struct video_device *vdev; | 36 | struct video_device *vdev; |
37 | struct v4l2_events *events; /* events, pending and subscribed */ | 37 | struct v4l2_ctrl_handler *ctrl_handler; |
38 | enum v4l2_priority prio; | 38 | enum v4l2_priority prio; |
39 | |||
40 | /* Events */ | ||
41 | wait_queue_head_t wait; | ||
42 | struct list_head subscribed; /* Subscribed events */ | ||
43 | struct list_head available; /* Dequeueable event */ | ||
44 | unsigned int navailable; | ||
45 | u32 sequence; | ||
39 | }; | 46 | }; |
40 | 47 | ||
41 | /* | 48 | /* |
@@ -44,7 +51,7 @@ struct v4l2_fh { | |||
44 | * from driver's v4l2_file_operations->open() handler if the driver | 51 | * from driver's v4l2_file_operations->open() handler if the driver |
45 | * uses v4l2_fh. | 52 | * uses v4l2_fh. |
46 | */ | 53 | */ |
47 | int v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev); | 54 | void v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev); |
48 | /* | 55 | /* |
49 | * Add the fh to the list of file handles on a video_device. The file | 56 | * Add the fh to the list of file handles on a video_device. The file |
50 | * handle must be initialised first. | 57 | * handle must be initialised first. |