|
 |
8e623c |
diff -Naurp a/xlat/v4l2_control_id_bases.h b/xlat/v4l2_control_id_bases.h
|
|
|
8e623c |
--- a/xlat/v4l2_control_id_bases.h 2018-08-14 00:44:25.000000000 +0000
|
|
|
8e623c |
+++ b/xlat/v4l2_control_id_bases.h 2019-05-23 12:21:15.396137688 +0000
|
|
|
8e623c |
@@ -31,12 +31,16 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
|
|
|
8e623c |
#else
|
|
|
8e623c |
# define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050)
|
|
|
8e623c |
#endif
|
|
|
8e623c |
+#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
|
|
|
8e623c |
+# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
|
|
|
8e623c |
+# undef V4L2_CID_USER_IMX_BASE
|
|
|
8e623c |
+#endif
|
|
|
8e623c |
#if defined(V4L2_CID_USER_IMX_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_IMX_BASE) && HAVE_DECL_V4L2_CID_USER_IMX_BASE)
|
|
|
8e623c |
DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
|
|
|
8e623c |
-static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x1090)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x1090)");
|
|
|
8e623c |
+static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x10b0)");
|
|
|
8e623c |
DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
|
|
|
8e623c |
#else
|
|
|
8e623c |
-# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x1090)
|
|
|
8e623c |
+# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0)
|
|
|
8e623c |
#endif
|
|
|
8e623c |
#if defined(V4L2_CID_MPEG_BASE) || (defined(HAVE_DECL_V4L2_CID_MPEG_BASE) && HAVE_DECL_V4L2_CID_MPEG_BASE)
|
|
|
8e623c |
DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
|
|
|
8e623c |
@@ -146,6 +150,21 @@ const struct xlat v4l2_control_id_bases[
|
|
|
8e623c |
XLAT(V4L2_CID_USER_MEYE_BASE),
|
|
|
8e623c |
XLAT(V4L2_CID_USER_BTTV_BASE),
|
|
|
8e623c |
XLAT(V4L2_CID_USER_TI_VPE_BASE),
|
|
|
8e623c |
+#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
|
|
|
8e623c |
+# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
|
|
|
8e623c |
+/*
|
|
|
8e623c |
+* Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48
|
|
|
8e623c |
+* has changed the value of V4L2_CID_USER_IMX_BASE constant introduced
|
|
|
8e623c |
+* by commit v4.13-rc1~141^2~121 because the old value was already used
|
|
|
8e623c |
+* by V4L2_CID_USER_MAX217X_BASE.
|
|
|
8e623c |
+* This is of course an ABI breakage that affects Linux kernels starting
|
|
|
8e623c |
+* with 4.13 and up to 4.18, as well as their LTS derivatives.
|
|
|
8e623c |
+* Since the imx driver didn't provide any public control ID definitions,
|
|
|
8e623c |
+* it looks like the best way to handle this situation is to pretend that
|
|
|
8e623c |
+* the old value of V4L2_CID_USER_IMX_BASE didn't exist.
|
|
|
8e623c |
+*/
|
|
|
8e623c |
+# undef V4L2_CID_USER_IMX_BASE
|
|
|
8e623c |
+#endif
|
|
|
8e623c |
XLAT(V4L2_CID_USER_IMX_BASE),
|
|
|
8e623c |
XLAT(V4L2_CID_MPEG_BASE),
|
|
|
8e623c |
XLAT(V4L2_CID_MPEG_CX2341X_BASE),
|
|
|
8e623c |
diff -Naurp a/xlat/v4l2_control_id_bases.in b/xlat/v4l2_control_id_bases.in
|
|
|
8e623c |
--- a/xlat/v4l2_control_id_bases.in 2018-05-06 15:34:41.000000000 +0000
|
|
|
8e623c |
+++ b/xlat/v4l2_control_id_bases.in 2019-05-23 12:21:01.146061843 +0000
|
|
|
8e623c |
@@ -2,7 +2,22 @@ V4L2_CID_BASE (V4L2_CTRL_CLASS_USER |
|
|
|
8e623c |
V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000)
|
|
|
8e623c |
V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010)
|
|
|
8e623c |
V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050)
|
|
|
8e623c |
-V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x1090)
|
|
|
8e623c |
+#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
|
|
|
8e623c |
+# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE
|
|
|
8e623c |
+/*
|
|
|
8e623c |
+ * Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48
|
|
|
8e623c |
+ * has changed the value of V4L2_CID_USER_IMX_BASE constant introduced
|
|
|
8e623c |
+ * by commit v4.13-rc1~141^2~121 because the old value was already used
|
|
|
8e623c |
+ * by V4L2_CID_USER_MAX217X_BASE.
|
|
|
8e623c |
+ * This is of course an ABI breakage that affects Linux kernels starting
|
|
|
8e623c |
+ * with 4.13 and up to 4.18, as well as their LTS derivatives.
|
|
|
8e623c |
+ * Since the imx driver didn't provide any public control ID definitions,
|
|
|
8e623c |
+ * it looks like the best way to handle this situation is to pretend that
|
|
|
8e623c |
+ * the old value of V4L2_CID_USER_IMX_BASE didn't exist.
|
|
|
8e623c |
+ */
|
|
|
8e623c |
+# undef V4L2_CID_USER_IMX_BASE
|
|
|
8e623c |
+#endif
|
|
|
8e623c |
+V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0)
|
|
|
8e623c |
V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)
|
|
|
8e623c |
V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000)
|
|
|
8e623c |
V4L2_CID_MPEG_MFC51_BASE (V4L2_CTRL_CLASS_MPEG | 0x1100)
|