From 2d35915b13ae0147ca4133c93cdbee280ef9dff6 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 11 May 2018 14:20:05 +0200 Subject: sys/linux: add missing consts for video4linux.txt For now other arches are regenerated on upstream tree. It does not contain a bunch of consts, so we define them to 1 for now. arm64 consts are left intact. video4linux.txt is added to "android" files in syz-extract, so that future make extract runs don't overwrite arm64 consts. Also fix VIDIOC_G_FBUF argument direction, currently tests crash with: panic: call ioctl$VIDIOC_G_FBUF: pointer arg 'buffer' has output direction [recovered] panic: call ioctl$VIDIOC_G_FBUF: pointer arg 'buffer' has output direction --- sys/linux/video4linux.txt | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'sys/linux/video4linux.txt') diff --git a/sys/linux/video4linux.txt b/sys/linux/video4linux.txt index 3c08f4c31..1fd0fd8a9 100644 --- a/sys/linux/video4linux.txt +++ b/sys/linux/video4linux.txt @@ -27,7 +27,7 @@ ioctl$VIDIOC_G_FMT(fd fd_video, cmd const[VIDIOC_G_FMT], arg ptr[inout, v4l2_for ioctl$VIDIOC_S_FMT(fd fd_video, cmd const[VIDIOC_S_FMT], arg ptr[inout, v4l2_format]) ioctl$VIDIOC_REQBUFS(fd fd_video, cmd const[VIDIOC_REQBUFS], arg ptr[inout, v4l2_requestbuffers]) ioctl$VIDIOC_QUERYBUF(fd fd_video, cmd const[VIDIOC_QUERYBUF], arg ptr[inout, v4l2_buffer]) -ioctl$VIDIOC_G_FBUF(fd fd_video, cmd const[VIDIOC_G_FBUF], arg ptr[out, v4l2_framebuffer]) +ioctl$VIDIOC_G_FBUF(fd fd_video, cmd const[VIDIOC_G_FBUF], arg ptr[inout, v4l2_framebuffer]) ioctl$VIDIOC_S_FBUF(fd fd_video, cmd const[VIDIOC_S_FBUF], arg ptr[in, v4l2_framebuffer]) ioctl$VIDIOC_OVERLAY(fd fd_video, cmd const[VIDIOC_OVERLAY], arg ptr[in, int32]) ioctl$VIDIOC_QBUF(fd fd_video, cmd const[VIDIOC_QBUF], arg ptr[inout, v4l2_buffer]) @@ -946,3 +946,40 @@ v4l2_input_capabilities = V4L2_IN_CAP_DV_TIMINGS, V4L2_IN_CAP_CUSTOM_TIMINGS, V4 v4l2_output_type = V4L2_OUTPUT_TYPE_MODULATOR, V4L2_OUTPUT_TYPE_ANALOG, V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY v4l2_output_capabilities = V4L2_OUT_CAP_DV_TIMINGS, V4L2_OUT_CAP_CUSTOM_TIMINGS, V4L2_OUT_CAP_STD, V4L2_OUT_CAP_NATIVE_SIZE v4l2_query_ext_ctrl = V4L2_CTRL_FLAG_NEXT_CTRL, V4L2_CTRL_FLAG_NEXT_COMPOUND + +# arm64 constants are generated on an unknown tree which includes all constants. +# Other archs were generated on upstream tree, but it does not have the following consts. +# Potentially we could use https://android.googlesource.com/kernel/msm/+/android-msm-wahoo-4.4-p-preview-2 +# but it does not contain a different subset of consts. +define V4L2_QCOM_BUF_FLAG_PERF_MODE 1 +define V4L2_QCOM_CMD_FLUSH_CAPTURE 1 +define V4L2_QCOM_CMD_SESSION_CONTINUE 1 +define V4L2_EVENT_MSM_VIDC_FLUSH_DONE 1 +define V4L2_QCOM_CMD_FLUSH_OUTPUT 1 +define V4L2_QCOM_BUF_FLAG_READONLY 1 +define V4L2_PIX_FMT_NV12_UBWC 1 +define V4L2_EVENT_MSM_VIDC_SYS_ERROR 1 +define V4L2_PIX_FMT_RGBA8888_UBWC 1 +define V4L2_QCOM_BUF_FLAG_CODECCONFIG 1 +define V4L2_EVENT_MSM_VIDC_HW_UNSUPPORTED 1 +define V4L2_EVENT_MSM_VIDC_PORT_SETTINGS_BITDEPTH_CHANGED_INSUFFICIENT 1 +define V4L2_QCOM_BUF_TIMESTAMP_INVALID 1 +define V4L2_QCOM_BUF_FLAG_EOSEQ 1 +define V4L2_QCOM_BUF_FLAG_EOS 1 +define V4L2_EVENT_MSM_VIDC_MAX_CLIENTS 1 +define V4L2_PIX_FMT_NV12_P010_UBWC 1 +define V4L2_PIX_FMT_NV12_TP10_UBWC 1 +define V4L2_QCOM_BUF_INPUT_UNSUPPORTED 1 +define V4L2_EVENT_MSM_VIDC_HW_OVERLOAD 1 +define V4L2_EVENT_MSM_VIDC_RELEASE_UNQUEUED_BUFFER 1 +define V4L2_PIX_FMT_TME 1 +define V4L2_QCOM_CMD_FLUSH 1 +define V4L2_EVENT_MSM_VIDC_PORT_SETTINGS_CHANGED_SUFFICIENT 1 +define V4L2_QCOM_BUF_FLAG_IDRFRAME 1 +define V4L2_EVENT_MSM_VIDC_START 1 +define V4L2_QCOM_BUF_DATA_CORRUPT 1 +define V4L2_QCOM_BUF_FLAG_DECODEONLY 1 +define V4L2_MSM_BUF_FLAG_DEFER 1 +define V4L2_EVENT_MSM_VIDC_PORT_SETTINGS_CHANGED_INSUFFICIENT 1 +define V4L2_EVENT_MSM_VIDC_RELEASE_BUFFER_REFERENCE 1 +define V4L2_DEC_QCOM_CMD_RECONFIG_HINT 1 -- cgit mrf-deployment