summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2011-08-04 13:51:11 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-04-10 14:49:44 -0300
commitce580fe5190dec4d872e7925946b0aec1f694370 (patch)
treecb745116ea3f1fb4f8cb327810b43b140fcb8fb8 /include/media
parent3fd7e4341e04f80e2605f56bbd8cb1e8b027901a (diff)
downloadop-kernel-dev-ce580fe5190dec4d872e7925946b0aec1f694370.zip
op-kernel-dev-ce580fe5190dec4d872e7925946b0aec1f694370.tar.gz
[media] v4l: Introduce integer menu controls
Create a new control type called V4L2_CTRL_TYPE_INTEGER_MENU. Integer menu controls are just like menu controls but the menu items are 64-bit integers rather than strings. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-ctrls.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 3dbd066..533315b 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -130,7 +130,10 @@ struct v4l2_ctrl {
u32 step;
u32 menu_skip_mask;
};
- const char * const *qmenu;
+ union {
+ const char * const *qmenu;
+ const s64 *qmenu_int;
+ };
unsigned long flags;
union {
s32 val;
@@ -220,6 +223,7 @@ struct v4l2_ctrl_config {
u32 flags;
u32 menu_skip_mask;
const char * const *qmenu;
+ const s64 *qmenu_int;
unsigned int is_private:1;
};
OpenPOWER on IntegriCloud