diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-04-08 17:59:52 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-07 21:40:31 +0200 |
| commit | 55afeb8a4d3ffdf8de546d5de37aca5b229ca9a4 (patch) | |
| tree | c2faa161e1265e81e57c9ba66360005869d43699 /drivers/media/video/uvc/uvcvideo.h | |
| parent | [media] uvcvideo: Add support for control events (diff) | |
| download | linux-55afeb8a4d3ffdf8de546d5de37aca5b229ca9a4.tar.xz linux-55afeb8a4d3ffdf8de546d5de37aca5b229ca9a4.zip | |
[media] uvcvideo: Properly report the inactive flag for inactive controls
Note the unused in this patch slave_ids addition to the mappings will get
used in a follow up patch to generate control change events for the slave
ctrls when their flags change due to the master control changing value.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvcvideo.h')
| -rw-r--r-- | drivers/media/video/uvc/uvcvideo.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index e43deb715d98..777bb7505f8d 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h @@ -172,6 +172,10 @@ struct uvc_control_mapping { struct uvc_menu_info *menu_info; __u32 menu_count; + __u32 master_id; + __s32 master_manual; + __u32 slave_ids[2]; + __s32 (*get) (struct uvc_control_mapping *mapping, __u8 query, const __u8 *data); void (*set) (struct uvc_control_mapping *mapping, __s32 value, |