aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-06-10 06:30:04 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-17 10:57:25 -0400
commitdda4a4d5ea245591b788b70116fb52b0d145fb33 (patch)
treea2af83ebced1a70394def9a63eac916566cb1dfa /include
parent04d8b04e50c87cd858effe865e82a9012b6eaba0 (diff)
[media] v4l2-ctrls/videodev2.h: add u8 and u16 types
These are needed by the upcoming patches for the motion detection matrices. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include')
-rw-r--r--include/media/v4l2-ctrls.h4
-rw-r--r--include/uapi/linux/videodev2.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 7915b1125bb5..c630345e9fd2 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -39,12 +39,16 @@ struct poll_table_struct;
39/** union v4l2_ctrl_ptr - A pointer to a control value. 39/** union v4l2_ctrl_ptr - A pointer to a control value.
40 * @p_s32: Pointer to a 32-bit signed value. 40 * @p_s32: Pointer to a 32-bit signed value.
41 * @p_s64: Pointer to a 64-bit signed value. 41 * @p_s64: Pointer to a 64-bit signed value.
42 * @p_u8: Pointer to a 8-bit unsigned value.
43 * @p_u16: Pointer to a 16-bit unsigned value.
42 * @p_char: Pointer to a string. 44 * @p_char: Pointer to a string.
43 * @p: Pointer to a compound value. 45 * @p: Pointer to a compound value.
44 */ 46 */
45union v4l2_ctrl_ptr { 47union v4l2_ctrl_ptr {
46 s32 *p_s32; 48 s32 *p_s32;
47 s64 *p_s64; 49 s64 *p_s64;
50 u8 *p_u8;
51 u16 *p_u16;
48 char *p_char; 52 char *p_char;
49 void *p; 53 void *p;
50}; 54};
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 0297980fe491..632de96b42d5 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -1254,6 +1254,8 @@ struct v4l2_ext_control {
1254 __s32 value; 1254 __s32 value;
1255 __s64 value64; 1255 __s64 value64;
1256 char *string; 1256 char *string;
1257 __u8 *p_u8;
1258 __u16 *p_u16;
1257 void *ptr; 1259 void *ptr;
1258 }; 1260 };
1259} __attribute__ ((packed)); 1261} __attribute__ ((packed));
@@ -1284,6 +1286,8 @@ enum v4l2_ctrl_type {
1284 1286
1285 /* Compound types are >= 0x0100 */ 1287 /* Compound types are >= 0x0100 */
1286 V4L2_CTRL_COMPOUND_TYPES = 0x0100, 1288 V4L2_CTRL_COMPOUND_TYPES = 0x0100,
1289 V4L2_CTRL_TYPE_U8 = 0x0100,
1290 V4L2_CTRL_TYPE_U16 = 0x0101,
1287}; 1291};
1288 1292
1289/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ 1293/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */