michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: sensor: scd4x: Fix to allow the use of multiple models

Browse source 
Compilation will fail if multiple models are used at the same time.
Changing to define different unique names for the symbols
to avoid conflicts.

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
This commit is contained in:
TOKITA Hiroshi 2024-11-30 13:15:08 +09:00 • committed by Benjamin Cabé
commit 0e978fb1e6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/sensor/sensirion/scd4x/scd4x.c
View file

@ -889,14 +889,14 @@ static DEVICE_API(sensor, scd4x_api_funcs) = {
};
#define SCD4X_INIT(inst, scd4x_model) \
static struct scd4x_data scd4x_data_##inst; \
static const struct scd4x_config scd4x_config_##inst = { \
static struct scd4x_data scd4x_data_##scd4x_model##_##inst; \
static const struct scd4x_config scd4x_config_##scd4x_model##_##inst = { \
.bus = I2C_DT_SPEC_INST_GET(inst), \
.model = scd4x_model, \
.mode = DT_INST_ENUM_IDX_OR(inst, mode, SCD4X_MODE_NORMAL), \
}; \
SENSOR_DEVICE_DT_INST_DEFINE(inst, scd4x_init, NULL, &scd4x_data_##inst, \
&scd4x_config_##inst, POST_KERNEL, \
SENSOR_DEVICE_DT_INST_DEFINE(inst, scd4x_init, NULL, &scd4x_data_##scd4x_model##_##inst, \
&scd4x_config_##scd4x_model##_##inst, POST_KERNEL, \
CONFIG_SENSOR_INIT_PRIORITY, &scd4x_api_funcs);
#define DT_DRV_COMPAT sensirion_scd40