summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Syromyatnikov <evgsyr@gmail.com>2020-02-27 00:57:02 +0100
committerEugene Syromyatnikov <evgsyr@gmail.com>2020-03-23 13:32:13 +0100
commit01c53da3639fc01a9663d2e2f635531e416b8003 (patch)
treef611c4a395e87f684d023cac8806841206f49eb3
parentc0c2fc6fe5c8d8e04d11aef8d94f32ae830a3f96 (diff)
downloadstrace-01c53da3639fc01a9663d2e2f635531e416b8003.tar.gz
v4l2: print struct v4l2_sliced_vbi_format.service_set as flags
As it is treated as flag set in the code. * v4l2.c (print_v4l2_format_fmt): Use printflags instead of printxval for printing struct v4l2_sliced_vbi_format.service_set field. * tests/ioctl_v4l2-success.c: Update expected output.
-rw-r--r--tests/ioctl_v4l2-success.c3
-rw-r--r--v4l2.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/ioctl_v4l2-success.c b/tests/ioctl_v4l2-success.c
index de9300406..13c5e34b3 100644
--- a/tests/ioctl_v4l2-success.c
+++ b/tests/ioctl_v4l2-success.c
@@ -287,7 +287,8 @@ print_fmt(const char *pfx, struct v4l2_format *f)
case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
printf("%sfmt.sliced={service_set="
- XLAT_UNKNOWN(0xfeed, "V4L2_SLICED_???")
+ XLAT_KNOWN(0xfeed, "V4L2_SLICED_VBI_625"
+ "|V4L2_SLICED_CAPTION_525|0xaaec")
", io_size=3740978925, service_lines=[[0xdead, 0xdeac"
", 0xdeaf, 0xdeae, 0xdea9, 0xdea8, 0xdeab, 0xdeaa"
", 0xdea5, 0xdea4, 0xdea7, 0xdea6, 0xdea1, 0xdea0"
diff --git a/v4l2.c b/v4l2.c
index 32e48d877..d346afaea 100644
--- a/v4l2.c
+++ b/v4l2.c
@@ -330,8 +330,8 @@ print_v4l2_format_fmt(struct tcb *const tcp, const char *prefix,
tprints(prefix);
tprints("fmt.sliced={service_set=");
- printxval(v4l2_sliced_flags, f->fmt.sliced.service_set,
- "V4L2_SLICED_???");
+ printflags(v4l2_sliced_flags, f->fmt.sliced.service_set,
+ "V4L2_SLICED_???");
tprintf(", io_size=%u, service_lines=[",
f->fmt.sliced.io_size);
for (i = 0; i < ARRAY_SIZE(f->fmt.sliced.service_lines); i++) {