diff options
| author |   Hans Verkuil <hans.verkuil@cisco.com> | 2015-07-20 10:18:21 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-08-11 07:01:05 -0300 |
| commit | e56c597b027ba95a9ce6719462793da4a91d27d2 (patch) | |
| tree | 506dd6d435805d81fa21ddbcc8192ac2f5662a70 /drivers/media/pci/zoran/zoran.h | |
| parent | [media] zoran: use standard core lock (diff) | |
| download | linux-dev-e56c597b027ba95a9ce6719462793da4a91d27d2.tar.xz linux-dev-e56c597b027ba95a9ce6719462793da4a91d27d2.zip | |
[media] zoran: convert to the control framework and to v4l2_fh
Switch this driver to the control framework and to v4l2_fh for
handling control events.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/zoran/zoran.h')
| -rw-r--r-- | drivers/media/pci/zoran/zoran.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/pci/zoran/zoran.h b/drivers/media/pci/zoran/zoran.h index 4109775e4c74..4e7db8939c2b 100644 --- a/drivers/media/pci/zoran/zoran.h +++ b/drivers/media/pci/zoran/zoran.h @@ -32,6 +32,8 @@ #define _BUZ_H_ #include <media/v4l2-device.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-fh.h> struct zoran_sync { unsigned long frame; /* number of buffer that has been free'd */ @@ -216,6 +218,7 @@ struct zoran; /* zoran_fh contains per-open() settings */ struct zoran_fh { + struct v4l2_fh fh; struct zoran *zr; enum zoran_map_mode map_mode; /* Flag which bufferset will map by next mmap() */ @@ -268,6 +271,7 @@ struct card_info { struct zoran { struct v4l2_device v4l2_dev; + struct v4l2_ctrl_handler hdl; struct video_device *video_dev; struct i2c_adapter i2c_adapter; /* */ |