From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Thu, 1 Nov 2018 17:22:50 +0000 (+0100)
Subject: xlat: update V4L2_CTRL_TYPE_* constants
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c57c523cd0c99bfec20338a8fd7ba76f476bc40;p=strace

xlat: update V4L2_CTRL_TYPE_* constants

* xlat/v4l2_control_types.in: Add fallback definitions for constants,
and #sorted.
* configure.ac (AC_CHECK_MEMBERS): Check for struct
v4l2_ext_control.string field.
* v4l2.c (print_v4l2_ext_control): Change guard macro
to HAVE_STRUCT_V4L2_EXT_CONTROL_STRING.
---

diff --git a/configure.ac b/configure.ac
index 5c47268e..6f5ada6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -804,6 +804,7 @@ AC_CHECK_DECLS(m4_normalize([
 
 AC_CHECK_MEMBERS(m4_normalize([
 	struct v4l2_capability.device_caps,
+	struct v4l2_ext_control.string,
 	struct v4l2_format.fmt.pix_mp,
 	struct v4l2_format.fmt.sdr,
 	struct v4l2_format.fmt.sliced,
diff --git a/v4l2.c b/v4l2.c
index 58cab3f9..afa5d443 100644
--- a/v4l2.c
+++ b/v4l2.c
@@ -809,7 +809,7 @@ print_v4l2_ext_control(struct tcb *tcp, void *elem_buf, size_t elem_size, void *
 
 	tprints("{id=");
 	printxval(v4l2_control_ids, p->id, "V4L2_CID_???");
-# if HAVE_DECL_V4L2_CTRL_TYPE_STRING
+# if HAVE_STRUCT_V4L2_EXT_CONTROL_STRING
 	tprintf(", size=%u", p->size);
 	if (p->size > 0) {
 		tprints(", string=");
diff --git a/xlat/v4l2_control_types.in b/xlat/v4l2_control_types.in
index 62cba6d3..3537738b 100644
--- a/xlat/v4l2_control_types.in
+++ b/xlat/v4l2_control_types.in
@@ -1,12 +1,13 @@
-V4L2_CTRL_TYPE_INTEGER
-V4L2_CTRL_TYPE_BOOLEAN
-V4L2_CTRL_TYPE_MENU
-V4L2_CTRL_TYPE_BUTTON
-V4L2_CTRL_TYPE_INTEGER64
-V4L2_CTRL_TYPE_CTRL_CLASS
-V4L2_CTRL_TYPE_STRING
-V4L2_CTRL_TYPE_BITMASK
-V4L2_CTRL_TYPE_INTEGER_MENU
-V4L2_CTRL_TYPE_U8
-V4L2_CTRL_TYPE_U16
-V4L2_CTRL_TYPE_U32
+#sorted
+V4L2_CTRL_TYPE_INTEGER			1
+V4L2_CTRL_TYPE_BOOLEAN			2
+V4L2_CTRL_TYPE_MENU			3
+V4L2_CTRL_TYPE_BUTTON			4
+V4L2_CTRL_TYPE_INTEGER64		5
+V4L2_CTRL_TYPE_CTRL_CLASS		6
+V4L2_CTRL_TYPE_STRING			7
+V4L2_CTRL_TYPE_BITMASK			8
+V4L2_CTRL_TYPE_INTEGER_MENU		9
+V4L2_CTRL_TYPE_U8			0x100
+V4L2_CTRL_TYPE_U16			0x101
+V4L2_CTRL_TYPE_U32			0x102