diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2011-02-24 08:42:24 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 15:37:55 -0400 |
commit | 0f62fd6a2fa12d6a63cbb18f9e30b05345f636f6 (patch) | |
tree | b5963e3b4a5e859949f0f76b96c58c503a30efa4 /include/media | |
parent | 022654930891c7ddfdb1ea34d6c4af9d1096bf91 (diff) |
[media] v4l2: add v4l2_prio_state to v4l2_device and video_device
Integrate the v4l2_prio_state into the core, ready for use.
One struct v4l2_prio_state is added to v4l2_device and a pointer
to a prio state is added to video_device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/v4l2-dev.h | 3 | ||||
-rw-r--r-- | include/media/v4l2-device.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 9193703f4f0f..3700127ba299 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
@@ -89,6 +89,9 @@ struct video_device | |||
89 | /* Control handler associated with this device node. May be NULL. */ | 89 | /* Control handler associated with this device node. May be NULL. */ |
90 | struct v4l2_ctrl_handler *ctrl_handler; | 90 | struct v4l2_ctrl_handler *ctrl_handler; |
91 | 91 | ||
92 | /* Priority state. If NULL, then v4l2_dev->prio will be used. */ | ||
93 | struct v4l2_prio_state *prio; | ||
94 | |||
92 | /* device info */ | 95 | /* device info */ |
93 | char name[32]; | 96 | char name[32]; |
94 | int vfl_type; | 97 | int vfl_type; |
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h index 0c2bd3075038..3b723283da26 100644 --- a/include/media/v4l2-device.h +++ b/include/media/v4l2-device.h | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | #include <media/media-device.h> | 24 | #include <media/media-device.h> |
25 | #include <media/v4l2-subdev.h> | 25 | #include <media/v4l2-subdev.h> |
26 | #include <media/v4l2-dev.h> | ||
26 | 27 | ||
27 | /* Each instance of a V4L2 device should create the v4l2_device struct, | 28 | /* Each instance of a V4L2 device should create the v4l2_device struct, |
28 | either stand-alone or embedded in a larger struct. | 29 | either stand-alone or embedded in a larger struct. |
@@ -55,6 +56,8 @@ struct v4l2_device { | |||
55 | unsigned int notification, void *arg); | 56 | unsigned int notification, void *arg); |
56 | /* The control handler. May be NULL. */ | 57 | /* The control handler. May be NULL. */ |
57 | struct v4l2_ctrl_handler *ctrl_handler; | 58 | struct v4l2_ctrl_handler *ctrl_handler; |
59 | /* Device's priority state */ | ||
60 | struct v4l2_prio_state prio; | ||
58 | /* BKL replacement mutex. Temporary solution only. */ | 61 | /* BKL replacement mutex. Temporary solution only. */ |
59 | struct mutex ioctl_lock; | 62 | struct mutex ioctl_lock; |
60 | }; | 63 | }; |