diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-06-10 06:30:04 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-17 10:57:25 -0400 |
| commit | dda4a4d5ea245591b788b70116fb52b0d145fb33 (patch) | |
| tree | a2af83ebced1a70394def9a63eac916566cb1dfa /include/uapi/linux | |
| parent | 04d8b04e50c87cd858effe865e82a9012b6eaba0 (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/uapi/linux')
| -rw-r--r-- | include/uapi/linux/videodev2.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 */ |
