aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-event.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-06-13 18:55:58 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 17:53:31 -0300
commit77068d36d8b9e9902a89b4bb01011d41926f5420 (patch)
tree4fde4974ce56e52acac5c7c8d873d300e946adcc /include/media/v4l2-event.h
parent[media] v4l2-events/fh: merge v4l2_events into v4l2_fh (diff)
downloadlinux-dev-77068d36d8b9e9902a89b4bb01011d41926f5420.tar.xz
linux-dev-77068d36d8b9e9902a89b4bb01011d41926f5420.zip
[media] v4l2-ctrls/event: remove struct v4l2_ctrl_fh, instead use v4l2_subscribed_event
The v4l2_ctrl_fh struct connected v4l2_ctrl with v4l2_fh so the control would know which filehandles subscribed to it. However, it is much easier to use struct v4l2_subscribed_event directly for that and get rid of that intermediate struct. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/v4l2-event.h')
-rw-r--r--include/media/v4l2-event.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/media/v4l2-event.h b/include/media/v4l2-event.h
index 042b893035de..eda17f8d78bc 100644
--- a/include/media/v4l2-event.h
+++ b/include/media/v4l2-event.h
@@ -38,9 +38,18 @@ struct v4l2_kevent {
};
struct v4l2_subscribed_event {
+ /* list node for the v4l2_fh->subscribed list */
struct list_head list;
+ /* event type */
u32 type;
+ /* associated object ID (e.g. control ID) */
u32 id;
+ /* copy of v4l2_event_subscription->flags */
+ u32 flags;
+ /* filehandle that subscribed to this event */
+ struct v4l2_fh *fh;
+ /* list node that hooks into the object's event list (if there is one) */
+ struct list_head node;
};
int v4l2_event_alloc(struct v4l2_fh *fh, unsigned int n);