aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/videodev2.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-08-11 17:47:18 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 11:19:17 -0400
commit6b5a9492ca0c991bab1ac495624e17520e9edf18 (patch)
tree4ee2bc89d42ceae84989df965ce426932d3a6fbe /include/linux/videodev2.h
parenta138ebcf826b9cbf6683e1db25905d7cd89e2dd1 (diff)
V4L/DVB (12543): v4l: introduce string control support.
The upcoming RDS encoder needs support for string controls. This patch implements the core implementation. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/linux/videodev2.h')
-rw-r--r--include/linux/videodev2.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 293ba181f95a..9ab4cbe676fd 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -167,6 +167,7 @@ enum v4l2_ctrl_type {
167 V4L2_CTRL_TYPE_BUTTON = 4, 167 V4L2_CTRL_TYPE_BUTTON = 4,
168 V4L2_CTRL_TYPE_INTEGER64 = 5, 168 V4L2_CTRL_TYPE_INTEGER64 = 5,
169 V4L2_CTRL_TYPE_CTRL_CLASS = 6, 169 V4L2_CTRL_TYPE_CTRL_CLASS = 6,
170 V4L2_CTRL_TYPE_STRING = 7,
170}; 171};
171 172
172enum v4l2_tuner_type { 173enum v4l2_tuner_type {
@@ -795,11 +796,12 @@ struct v4l2_control {
795 796
796struct v4l2_ext_control { 797struct v4l2_ext_control {
797 __u32 id; 798 __u32 id;
798 __u32 reserved2[2]; 799 __u32 size;
800 __u32 reserved2[1];
799 union { 801 union {
800 __s32 value; 802 __s32 value;
801 __s64 value64; 803 __s64 value64;
802 void *reserved; 804 char *string;
803 }; 805 };
804} __attribute__ ((packed)); 806} __attribute__ ((packed));
805 807