summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-08-11 23:47:18 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-08-11 23:47:18 +0200
commit4be4cfbd5a49c25a5d4fb78aed2e1246415ac7aa (patch)
treef9277da3c479dc7618aa44ed1aeb5d9bb471fe4b /linux/include
parentd20c7e6a12b8c15e0574c2cb7599ce6195684bd0 (diff)
downloadmediapointer-dvb-s2-4be4cfbd5a49c25a5d4fb78aed2e1246415ac7aa.tar.gz
mediapointer-dvb-s2-4be4cfbd5a49c25a5d4fb78aed2e1246415ac7aa.tar.bz2
v4l: introduce string control support.
From: Hans Verkuil <hverkuil@xs4all.nl> The upcoming RDS encoder needs support for string controls. This patch implements the core implementation. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/linux/videodev2.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h
index f94613802..409c505ff 100644
--- a/linux/include/linux/videodev2.h
+++ b/linux/include/linux/videodev2.h
@@ -167,6 +167,7 @@ enum v4l2_ctrl_type {
V4L2_CTRL_TYPE_BUTTON = 4,
V4L2_CTRL_TYPE_INTEGER64 = 5,
V4L2_CTRL_TYPE_CTRL_CLASS = 6,
+ V4L2_CTRL_TYPE_STRING = 7,
};
enum v4l2_tuner_type {
@@ -795,11 +796,12 @@ struct v4l2_control {
struct v4l2_ext_control {
__u32 id;
- __u32 reserved2[2];
+ __u32 size;
+ __u32 reserved2[1];
union {
__s32 value;
__s64 value64;
- void *reserved;
+ char *string;
};
} __attribute__ ((packed));