diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2023-02-13 08:00:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2023-02-13 08:00:00 +0000 |
| commit | 4bcd2c3c087992b54de67af4357e520f2311fe95 (patch) | |
| tree | abdf79493dcfecbca4ef1df2ad83aabde600e0ac | |
| parent | 3b327c39998f77f902ea99f3893f72e41520c9f0 (diff) | |
| download | strace-4bcd2c3c087992b54de67af4357e520f2311fe95.tar.gz | |
xlat: update V4L2_CTRL_FLAG_* constants
* src/xlat/v4l2_control_flags.in (V4L2_CTRL_FLAG_DYNAMIC_ARRAY): New
constant introduced by Linux kernel commit v6.0-rc1~139^2~104.
* tests/ioctl_v4l2-success.c (main): Update expected output.
* NEWS: Mention this change.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/xlat/v4l2_control_flags.in | 1 | ||||
| -rw-r--r-- | tests/ioctl_v4l2-success.c | 10 |
3 files changed, 9 insertions, 5 deletions
@@ -5,7 +5,8 @@ Noteworthy changes in release ?.? (????-??-??) * Implemented decoding of IFLA_BRPORT_MAB and IFLA_DEVLINK_PORT netlink attributes. * Updated lists of ALG_*, BPF_*, IFLA_*, KEY_*, KVM_*, LANDLOCK_*, - MEMBARRIER_*, NFT_*, NTF_*, V4L2_CID_*, and V4L2_PIX_* constants. + MEMBARRIER_*, NFT_*, NTF_*, V4L2_CID_*, V4L2_CTRL_*, and V4L2_PIX_* + constants. * Updated lists of ioctl commands from Linux 6.2. Noteworthy changes in release 6.1 (2022-12-12) diff --git a/src/xlat/v4l2_control_flags.in b/src/xlat/v4l2_control_flags.in index 35c9e76be..fa9374028 100644 --- a/src/xlat/v4l2_control_flags.in +++ b/src/xlat/v4l2_control_flags.in @@ -10,3 +10,4 @@ V4L2_CTRL_FLAG_VOLATILE V4L2_CTRL_FLAG_HAS_PAYLOAD V4L2_CTRL_FLAG_EXECUTE_ON_WRITE V4L2_CTRL_FLAG_MODIFY_LAYOUT +V4L2_CTRL_FLAG_DYNAMIC_ARRAY diff --git a/tests/ioctl_v4l2-success.c b/tests/ioctl_v4l2-success.c index 4acea3b59..3850275e3 100644 --- a/tests/ioctl_v4l2-success.c +++ b/tests/ioctl_v4l2-success.c @@ -1080,7 +1080,7 @@ main(int argc, char **argv) }; static const struct strval32 ctrl_flags[] = { { ARG_STR(0) }, - { ARG_XLAT_KNOWN(0x7ff, "V4L2_CTRL_FLAG_DISABLED" + { ARG_XLAT_KNOWN(0xfff, "V4L2_CTRL_FLAG_DISABLED" "|V4L2_CTRL_FLAG_GRABBED" "|V4L2_CTRL_FLAG_READ_ONLY" "|V4L2_CTRL_FLAG_UPDATE" @@ -1090,15 +1090,17 @@ main(int argc, char **argv) "|V4L2_CTRL_FLAG_VOLATILE" "|V4L2_CTRL_FLAG_HAS_PAYLOAD" "|V4L2_CTRL_FLAG_EXECUTE_ON_WRITE" - "|V4L2_CTRL_FLAG_MODIFY_LAYOUT") }, + "|V4L2_CTRL_FLAG_MODIFY_LAYOUT" + "|V4L2_CTRL_FLAG_DYNAMIC_ARRAY") }, { ARG_XLAT_KNOWN(0xbeefface, "V4L2_CTRL_FLAG_GRABBED" "|V4L2_CTRL_FLAG_READ_ONLY" "|V4L2_CTRL_FLAG_UPDATE" "|V4L2_CTRL_FLAG_WRITE_ONLY" "|V4L2_CTRL_FLAG_VOLATILE" "|V4L2_CTRL_FLAG_EXECUTE_ON_WRITE" - "|0xbeeff800") }, - { ARG_XLAT_UNKNOWN(0xfffff800, "V4L2_CTRL_FLAG_???") }, + "|V4L2_CTRL_FLAG_DYNAMIC_ARRAY" + "|0xbeeff000") }, + { ARG_XLAT_UNKNOWN(0xfffff000, "V4L2_CTRL_FLAG_???") }, }; static const size_t qctrl_iters = MAX(MAX(ARRAY_SIZE(cids), ARRAY_SIZE(ctrl_types)), |