michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: sensor: mcux_acmp: fix expansion-to-defined warning

Browse source 
Rework the checks for INPSEL, INNSEL, and C0_OFFSET_BIT presence to
avoid warnings when -Wexpansion-to-defined is enabled.

The warning was enabled in c7bc6380bd.

Fixes #32475.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2021-02-19 14:42:25 +01:00 • committed by Anas Nashif
commit 71d7f3f916
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
drivers/sensor/mcux_acmp/mcux_acmp.c
View file

@ -14,17 +14,23 @@
LOG_MODULE_REGISTER(mcux_acmp, CONFIG_SENSOR_LOG_LEVEL); LOG_MODULE_REGISTER(mcux_acmp, CONFIG_SENSOR_LOG_LEVEL);
#define MCUX_ACMP_HAS_INPSEL \ #if defined(FSL_FEATURE_ACMP_HAS_C1_INPSEL_BIT) && (FSL_FEATURE_ACMP_HAS_C1_INPSEL_BIT == 1U)
defined(FSL_FEATURE_ACMP_HAS_C1_INPSEL_BIT) && \ #define MCUX_ACMP_HAS_INPSEL 1
(FSL_FEATURE_ACMP_HAS_C1_INPSEL_BIT == 1U) #else
#define MCUX_ACMP_HAS_INPSEL 0
#endif
#define MCUX_ACMP_HAS_INNSEL \ #if defined(FSL_FEATURE_ACMP_HAS_C1_INNSEL_BIT) && (FSL_FEATURE_ACMP_HAS_C1_INNSEL_BIT == 1U)
defined(FSL_FEATURE_ACMP_HAS_C1_INNSEL_BIT) && \ #define MCUX_ACMP_HAS_INNSEL 1
(FSL_FEATURE_ACMP_HAS_C1_INNSEL_BIT == 1U) #else
#define MCUX_ACMP_HAS_INNSEL 0
#endif
#define MCUX_ACMP_HAS_OFFSET \ #if defined(FSL_FEATURE_ACMP_HAS_C0_OFFSET_BIT) && (FSL_FEATURE_ACMP_HAS_C0_OFFSET_BIT == 1U)
defined(FSL_FEATURE_ACMP_HAS_C0_OFFSET_BIT) && \ #define MCUX_ACMP_HAS_OFFSET 1
(FSL_FEATURE_ACMP_HAS_C0_OFFSET_BIT == 1U) #else
#define MCUX_ACMP_HAS_OFFSET 0
#endif
#define MCUX_ACMP_DAC_LEVELS 256 #define MCUX_ACMP_DAC_LEVELS 256
#define MCUX_ACMP_INPUT_CHANNELS 8 #define MCUX_ACMP_INPUT_CHANNELS 8