michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: adc: stm32: Refactor driver init section

Browse source 
Slightly refactor STM32_ADC_INIT macro.
adc_stm32_cfg_##index declaration is now part of ADC_STM32_INIT
and extracted from CONFIG_ADC_STM32_SHARED_IRQS #ifdef.

Aim is to minimize code duplication when adding new adc_stm32_cfg_X
or adc_stm32_data_Y entries

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2023-01-13 09:06:43 +01:00 • committed by Fabio Baltieri
commit 34e49a7c54
1 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

44
drivers/adc/adc_stm32.c
View file

@ -1457,32 +1457,35 @@ static void adc_stm32_irq_init(void)
} }
} }
#define ADC_STM32_CONFIG(index) \ #define ADC_STM32_IRQ_CONFIG(index)
static const struct adc_stm32_cfg adc_stm32_cfg_##index = { \ #define ADC_STM32_IRQ_FUNC(index) \
.base = (ADC_TypeDef *)DT_INST_REG_ADDR(index), \
.irq_cfg_func = adc_stm32_irq_init, \ .irq_cfg_func = adc_stm32_irq_init, \
.pclken = { \
.enr = DT_INST_CLOCKS_CELL(index, bits), \
.bus = DT_INST_CLOCKS_CELL(index, bus), \
}, \
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(index), \
.has_temp_channel = DT_INST_PROP(index, has_temp_channel), \
.has_vref_channel = DT_INST_PROP(index, has_vref_channel), \
.has_vbat_channel = DT_INST_PROP(index, has_vbat_channel), \
};
#else #else
#define ADC_STM32_CONFIG(index) \
#define ADC_STM32_IRQ_CONFIG(index) \
static void adc_stm32_cfg_func_##index(void) \ static void adc_stm32_cfg_func_##index(void) \
{ \ { \
IRQ_CONNECT(DT_INST_IRQN(index), \ IRQ_CONNECT(DT_INST_IRQN(index), \
DT_INST_IRQ(index, priority), \ DT_INST_IRQ(index, priority), \
adc_stm32_isr, DEVICE_DT_INST_GET(index), 0); \ adc_stm32_isr, DEVICE_DT_INST_GET(index), 0); \
irq_enable(DT_INST_IRQN(index)); \ irq_enable(DT_INST_IRQN(index)); \
} \ }
#define ADC_STM32_IRQ_FUNC(index) \
.irq_cfg_func = adc_stm32_cfg_func_##index,
#endif /* CONFIG_ADC_STM32_SHARED_IRQS */
#define ADC_STM32_INIT(index) \
\
PINCTRL_DT_INST_DEFINE(index); \
\
ADC_STM32_IRQ_CONFIG(index) \
\ \
static const struct adc_stm32_cfg adc_stm32_cfg_##index = { \ static const struct adc_stm32_cfg adc_stm32_cfg_##index = { \
.base = (ADC_TypeDef *)DT_INST_REG_ADDR(index), \ .base = (ADC_TypeDef *)DT_INST_REG_ADDR(index), \
.irq_cfg_func = adc_stm32_cfg_func_##index, \ ADC_STM32_IRQ_FUNC(index) \
.pclken = { \ .pclken = { \
.enr = DT_INST_CLOCKS_CELL(index, bits), \ .enr = DT_INST_CLOCKS_CELL(index, bits), \
.bus = DT_INST_CLOCKS_CELL(index, bus), \ .bus = DT_INST_CLOCKS_CELL(index, bus), \
@ -1491,14 +1494,7 @@ static const struct adc_stm32_cfg adc_stm32_cfg_##index = { \
.has_temp_channel = DT_INST_PROP(index, has_temp_channel), \ .has_temp_channel = DT_INST_PROP(index, has_temp_channel), \
.has_vref_channel = DT_INST_PROP(index, has_vref_channel), \ .has_vref_channel = DT_INST_PROP(index, has_vref_channel), \
.has_vbat_channel = DT_INST_PROP(index, has_vbat_channel), \ .has_vbat_channel = DT_INST_PROP(index, has_vbat_channel), \
}; }; \
#endif /* CONFIG_ADC_STM32_SHARED_IRQS */
#define STM32_ADC_INIT(index) \
\
PINCTRL_DT_INST_DEFINE(index); \
\
ADC_STM32_CONFIG(index) \
\ \
static struct adc_stm32_data adc_stm32_data_##index = { \ static struct adc_stm32_data adc_stm32_data_##index = { \
ADC_CONTEXT_INIT_TIMER(adc_stm32_data_##index, ctx), \ ADC_CONTEXT_INIT_TIMER(adc_stm32_data_##index, ctx), \
@ -1512,4 +1508,4 @@ DEVICE_DT_INST_DEFINE(index, \
POST_KERNEL, CONFIG_ADC_INIT_PRIORITY, \ POST_KERNEL, CONFIG_ADC_INIT_PRIORITY, \
&api_stm32_driver_api); &api_stm32_driver_api);
DT_INST_FOREACH_STATUS_OKAY(STM32_ADC_INIT) DT_INST_FOREACH_STATUS_OKAY(ADC_STM32_INIT)