From: "Dmitry V. Levin" Date: Sat, 18 Aug 2018 07:22:47 +0000 Subject: xlat: update V4L2_CID_USER_*_BASE constants Patch-mainline: yes Git-commit: 0f09267db00468b9204395c6990fc8816fd3c0e5 * xlat/v4l2_control_id_bases.in (V4L2_CID_USER_S2255_BASE, V4L2_CID_USER_SI476X_BASE, V4L2_CID_USER_SAA7134_BASE, V4L2_CID_USER_ADV7180_BASE, V4L2_CID_USER_TC358743_BASE, V4L2_CID_USER_MAX217X_BASE): New constants. Signed-off-by: Jiri Slaby --- xlat/v4l2_control_id_bases.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xlat/v4l2_control_id_bases.in b/xlat/v4l2_control_id_bases.in index f3fd9255..a0f9ccae 100644 --- a/xlat/v4l2_control_id_bases.in +++ b/xlat/v4l2_control_id_bases.in @@ -1,7 +1,13 @@ V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) -V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000) -V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010) -V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) +V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE | 0x1000) +V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE | 0x1010) +V4L2_CID_USER_S2255_BASE (V4L2_CID_BASE | 0x1030) +V4L2_CID_USER_SI476X_BASE (V4L2_CID_BASE | 0x1040) +V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE | 0x1050) +V4L2_CID_USER_SAA7134_BASE (V4L2_CID_BASE | 0x1060) +V4L2_CID_USER_ADV7180_BASE (V4L2_CID_BASE | 0x1070) +V4L2_CID_USER_TC358743_BASE (V4L2_CID_BASE | 0x1080) +V4L2_CID_USER_MAX217X_BASE (V4L2_CID_BASE | 0x1090) #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE /* @@ -17,7 +23,7 @@ V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) */ # undef V4L2_CID_USER_IMX_BASE #endif -V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) +V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE | 0x10b0) V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) V4L2_CID_MPEG_MFC51_BASE (V4L2_CTRL_CLASS_MPEG | 0x1100) --- a/xlat/v4l2_control_id_bases.h 2018-10-24 16:38:06.020604843 +0200 +++ b/xlat/v4l2_control_id_bases.h 2018-10-24 16:38:21.752904814 +0200 @@ -12,24 +12,66 @@ #endif #if defined(V4L2_CID_USER_MEYE_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_MEYE_BASE) && HAVE_DECL_V4L2_CID_USER_MEYE_BASE) DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -static_assert((V4L2_CID_USER_MEYE_BASE) == ((V4L2_CID_BASE + 0x1000)), "V4L2_CID_USER_MEYE_BASE != (V4L2_CID_BASE + 0x1000)"); +static_assert((V4L2_CID_USER_MEYE_BASE) == ((V4L2_CID_BASE | 0x1000)), "V4L2_CID_USER_MEYE_BASE != (V4L2_CID_BASE | 0x1000)"); DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE #else -# define V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000) +# define V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE | 0x1000) #endif #if defined(V4L2_CID_USER_BTTV_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_BTTV_BASE) && HAVE_DECL_V4L2_CID_USER_BTTV_BASE) DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -static_assert((V4L2_CID_USER_BTTV_BASE) == ((V4L2_CID_BASE + 0x1010)), "V4L2_CID_USER_BTTV_BASE != (V4L2_CID_BASE + 0x1010)"); +static_assert((V4L2_CID_USER_BTTV_BASE) == ((V4L2_CID_BASE | 0x1010)), "V4L2_CID_USER_BTTV_BASE != (V4L2_CID_BASE | 0x1010)"); DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE #else -# define V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010) +# define V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE | 0x1010) +#endif +#if defined(V4L2_CID_USER_S2255_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_S2255_BASE) && HAVE_DECL_V4L2_CID_USER_S2255_BASE) +DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +static_assert((V4L2_CID_USER_S2255_BASE) == ((V4L2_CID_BASE | 0x1030)), "V4L2_CID_USER_S2255_BASE != (V4L2_CID_BASE | 0x1030)"); +DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE +#else +# define V4L2_CID_USER_S2255_BASE (V4L2_CID_BASE | 0x1030) +#endif +#if defined(V4L2_CID_USER_SI476X_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_SI476X_BASE) && HAVE_DECL_V4L2_CID_USER_SI476X_BASE) +DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +static_assert((V4L2_CID_USER_SI476X_BASE) == ((V4L2_CID_BASE | 0x1040)), "V4L2_CID_USER_SI476X_BASE != (V4L2_CID_BASE | 0x1040)"); +DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE +#else +# define V4L2_CID_USER_SI476X_BASE (V4L2_CID_BASE | 0x1040) #endif #if defined(V4L2_CID_USER_TI_VPE_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_TI_VPE_BASE) && HAVE_DECL_V4L2_CID_USER_TI_VPE_BASE) DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -static_assert((V4L2_CID_USER_TI_VPE_BASE) == ((V4L2_CID_BASE + 0x1050)), "V4L2_CID_USER_TI_VPE_BASE != (V4L2_CID_BASE + 0x1050)"); +static_assert((V4L2_CID_USER_TI_VPE_BASE) == ((V4L2_CID_BASE | 0x1050)), "V4L2_CID_USER_TI_VPE_BASE != (V4L2_CID_BASE | 0x1050)"); +DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE +#else +# define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE | 0x1050) +#endif +#if defined(V4L2_CID_USER_SAA7134_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_SAA7134_BASE) && HAVE_DECL_V4L2_CID_USER_SAA7134_BASE) +DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +static_assert((V4L2_CID_USER_SAA7134_BASE) == ((V4L2_CID_BASE | 0x1060)), "V4L2_CID_USER_SAA7134_BASE != (V4L2_CID_BASE | 0x1060)"); +DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE +#else +# define V4L2_CID_USER_SAA7134_BASE (V4L2_CID_BASE | 0x1060) +#endif +#if defined(V4L2_CID_USER_ADV7180_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_ADV7180_BASE) && HAVE_DECL_V4L2_CID_USER_ADV7180_BASE) +DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +static_assert((V4L2_CID_USER_ADV7180_BASE) == ((V4L2_CID_BASE | 0x1070)), "V4L2_CID_USER_ADV7180_BASE != (V4L2_CID_BASE | 0x1070)"); +DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE +#else +# define V4L2_CID_USER_ADV7180_BASE (V4L2_CID_BASE | 0x1070) +#endif +#if defined(V4L2_CID_USER_TC358743_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_TC358743_BASE) && HAVE_DECL_V4L2_CID_USER_TC358743_BASE) +DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +static_assert((V4L2_CID_USER_TC358743_BASE) == ((V4L2_CID_BASE | 0x1080)), "V4L2_CID_USER_TC358743_BASE != (V4L2_CID_BASE | 0x1080)"); +DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE +#else +# define V4L2_CID_USER_TC358743_BASE (V4L2_CID_BASE | 0x1080) +#endif +#if defined(V4L2_CID_USER_MAX217X_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_MAX217X_BASE) && HAVE_DECL_V4L2_CID_USER_MAX217X_BASE) +DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +static_assert((V4L2_CID_USER_MAX217X_BASE) == ((V4L2_CID_BASE | 0x1090)), "V4L2_CID_USER_MAX217X_BASE != (V4L2_CID_BASE | 0x1090)"); DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE #else -# define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) +# define V4L2_CID_USER_MAX217X_BASE (V4L2_CID_BASE | 0x1090) #endif #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE @@ -37,10 +79,10 @@ #endif #if defined(V4L2_CID_USER_IMX_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_IMX_BASE) && HAVE_DECL_V4L2_CID_USER_IMX_BASE) DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x10b0)"); +static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE | 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE | 0x10b0)"); DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE #else -# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) +# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE | 0x10b0) #endif #if defined(V4L2_CID_MPEG_BASE) || (defined(HAVE_DECL_V4L2_CID_MPEG_BASE) && HAVE_DECL_V4L2_CID_MPEG_BASE) DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE @@ -149,7 +191,13 @@ XLAT(V4L2_CID_BASE), XLAT(V4L2_CID_USER_MEYE_BASE), XLAT(V4L2_CID_USER_BTTV_BASE), + XLAT(V4L2_CID_USER_S2255_BASE), + XLAT(V4L2_CID_USER_SI476X_BASE), XLAT(V4L2_CID_USER_TI_VPE_BASE), + XLAT(V4L2_CID_USER_SAA7134_BASE), + XLAT(V4L2_CID_USER_ADV7180_BASE), + XLAT(V4L2_CID_USER_TC358743_BASE), + XLAT(V4L2_CID_USER_MAX217X_BASE), #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE /*