diff options
author | Sakari Ailus <sakari.ailus@iki.fi> | 2011-08-04 12:51:11 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-10 13:49:44 -0400 |
commit | ce580fe5190dec4d872e7925946b0aec1f694370 (patch) | |
tree | cb745116ea3f1fb4f8cb327810b43b140fcb8fb8 /include/linux/videodev2.h | |
parent | 3fd7e4341e04f80e2605f56bbd8cb1e8b027901a (diff) |
[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/linux/videodev2.h')
-rw-r--r-- | include/linux/videodev2.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index c9c9a4680cc5..e69cacc9e9ea 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -1151,6 +1151,7 @@ enum v4l2_ctrl_type { | |||
1151 | V4L2_CTRL_TYPE_CTRL_CLASS = 6, | 1151 | V4L2_CTRL_TYPE_CTRL_CLASS = 6, |
1152 | V4L2_CTRL_TYPE_STRING = 7, | 1152 | V4L2_CTRL_TYPE_STRING = 7, |
1153 | V4L2_CTRL_TYPE_BITMASK = 8, | 1153 | V4L2_CTRL_TYPE_BITMASK = 8, |
1154 | V4L2_CTRL_TYPE_INTEGER_MENU = 9, | ||
1154 | }; | 1155 | }; |
1155 | 1156 | ||
1156 | /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ | 1157 | /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ |
@@ -1170,7 +1171,10 @@ struct v4l2_queryctrl { | |||
1170 | struct v4l2_querymenu { | 1171 | struct v4l2_querymenu { |
1171 | __u32 id; | 1172 | __u32 id; |
1172 | __u32 index; | 1173 | __u32 index; |
1173 | __u8 name[32]; /* Whatever */ | 1174 | union { |
1175 | __u8 name[32]; /* Whatever */ | ||
1176 | __s64 value; | ||
1177 | }; | ||
1174 | __u32 reserved; | 1178 | __u32 reserved; |
1175 | }; | 1179 | }; |
1176 | 1180 | ||