diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-12-29 08:05:02 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 15:37:54 -0400 |
commit | 022654930891c7ddfdb1ea34d6c4af9d1096bf91 (patch) | |
tree | 396edb9d7c4dcde4e862e89b2ed4b770ad830462 /include/media/v4l2-dev.h | |
parent | 8c1476ffc0b820f6ca8cc0b3f50c8a0f57e8d82d (diff) |
[media] v4l2_prio: move from v4l2-common to v4l2-dev
We are going to move priority handling into the v4l2 core. As a consequence
the v4l2_prio helper functions need to be moved into the core videodev
module as well to prevent circular dependencies.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/v4l2-dev.h')
-rw-r--r-- | include/media/v4l2-dev.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 51b2c515f687..9193703f4f0f 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
@@ -37,6 +37,21 @@ struct v4l2_ctrl_handler; | |||
37 | #define V4L2_FL_REGISTERED (0) | 37 | #define V4L2_FL_REGISTERED (0) |
38 | #define V4L2_FL_USES_V4L2_FH (1) | 38 | #define V4L2_FL_USES_V4L2_FH (1) |
39 | 39 | ||
40 | /* Priority helper functions */ | ||
41 | |||
42 | struct v4l2_prio_state { | ||
43 | atomic_t prios[4]; | ||
44 | }; | ||
45 | |||
46 | void v4l2_prio_init(struct v4l2_prio_state *global); | ||
47 | int v4l2_prio_change(struct v4l2_prio_state *global, enum v4l2_priority *local, | ||
48 | enum v4l2_priority new); | ||
49 | void v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local); | ||
50 | void v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority local); | ||
51 | enum v4l2_priority v4l2_prio_max(struct v4l2_prio_state *global); | ||
52 | int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local); | ||
53 | |||
54 | |||
40 | struct v4l2_file_operations { | 55 | struct v4l2_file_operations { |
41 | struct module *owner; | 56 | struct module *owner; |
42 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); | 57 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); |