michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: sensor: ntc-thermistor: Fix wrong n_comp value

Browse source 
The value of n_comp is wrong for ntc-thermistor-generic. Introduce a
helper macro to compute n_comp correctly for both thermistor types.

Signed-off-by: Paweł Anikiel <pan@semihalf.com>
This commit is contained in:
Paweł Anikiel 2023-08-04 10:36:18 +00:00 • committed by Maureen Helm
commit 694b7fe822
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/sensor/ntc_thermistor/ntc_thermistor.c
View file

@ -95,9 +95,7 @@ static int ntc_thermistor_init(const struct device *dev)
return 0;
}
#define NTC_THERMISTOR_DEFINE(inst, id, comp_table) \
BUILD_ASSERT(ARRAY_SIZE(comp_table) % 2 == 0, "Compensation table needs to be even size"); \
\
#define NTC_THERMISTOR_DEFINE0(inst, id, _comp, _n_comp) \
static int compare_ohm_##id##inst(const void *key, const void *element); \
\
static struct ntc_thermistor_data ntc_thermistor_driver_##id##inst; \
@ -112,8 +110,8 @@ static int ntc_thermistor_init(const struct device *dev)
.pulldown_ohm = DT_INST_PROP(inst, pulldown_ohm), \
.connected_positive = DT_INST_PROP(inst, connected_positive), \
.type = { \
.comp = (const struct ntc_compensation *)comp_table, \
.n_comp = ARRAY_SIZE(comp_table), \
.comp = _comp, \
.n_comp = _n_comp, \
.ohm_cmp = compare_ohm_##id##inst, \
}, \
}, \
@ -130,12 +128,16 @@ static int ntc_thermistor_init(const struct device *dev)
&ntc_thermistor_cfg_##id##inst, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, \
&ntc_thermistor_driver_api);
#define NTC_THERMISTOR_DEFINE(inst, id, comp) \
NTC_THERMISTOR_DEFINE0(inst, id, comp, ARRAY_SIZE(comp))
/* ntc-thermistor-generic */
#define DT_DRV_COMPAT ntc_thermistor_generic
#define NTC_THERMISTOR_GENERIC_DEFINE(inst) \
static const uint32_t comp_##inst[] = DT_INST_PROP(inst, zephyr_compensation_table); \
NTC_THERMISTOR_DEFINE(inst, DT_DRV_COMPAT, comp_##inst)
NTC_THERMISTOR_DEFINE0(inst, DT_DRV_COMPAT, (struct ntc_compensation *)comp_##inst, \
ARRAY_SIZE(comp_##inst) / 2)
DT_INST_FOREACH_STATUS_OKAY(NTC_THERMISTOR_GENERIC_DEFINE)