| From 7d0fa6c9fc4364af23f67140895e85d2d344e6fb Mon Sep 17 00:00:00 2001 |
| From: Alexandre Courbot <acourbot@chromium.org> |
| Date: Mon, 21 May 2018 04:54:35 -0400 |
| Subject: [PATCH 2/4] BACKPORT: media: videodev2.h: add request_fd field to |
| v4l2_ext_controls |
| |
| If 'which' is V4L2_CTRL_WHICH_REQUEST_VAL, then the 'request_fd' field |
| can be used to specify a request for the G/S/TRY_EXT_CTRLS ioctls. |
| |
| Signed-off-by: Alexandre Courbot <acourbot@chromium.org> |
| Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> |
| Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| (cherry picked from commit f23317adf6a726b9dbedbe3a0363846f597cc0e8) |
| Signed-off-by: Alexandre Courbot <acourbot@chromium.org> |
| --- |
| include/uapi/linux/videodev2.h | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h |
| index cc97d83..3ee5ffb 100644 |
| --- a/include/uapi/linux/videodev2.h |
| +++ b/include/uapi/linux/videodev2.h |
| @@ -1615,7 +1615,8 @@ struct v4l2_ext_controls { |
| }; |
| __u32 count; |
| __u32 error_idx; |
| - __u32 reserved[2]; |
| + __s32 request_fd; |
| + __u32 reserved[1]; |
| struct v4l2_ext_control *controls; |
| }; |
| |
| @@ -1628,6 +1629,7 @@ struct v4l2_ext_controls { |
| #define V4L2_CTRL_MAX_DIMS (4) |
| #define V4L2_CTRL_WHICH_CUR_VAL 0 |
| #define V4L2_CTRL_WHICH_DEF_VAL 0x0f000000 |
| +#define V4L2_CTRL_WHICH_REQUEST_VAL 0x0f010000 |
| |
| enum v4l2_ctrl_type { |
| V4L2_CTRL_TYPE_INTEGER = 1, |
| -- |
| 2.16.4 |
| |
