This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push: new cfa5b82 arch/arm/src/stm32l4/stm32l4_adc.c: fix copy-paste mistake with CONFIG_STM32L4_ADC1_DMA_CFG cfa5b82 is described below commit cfa5b82e098ab2b5b717e898bfed593ebd935d05 Author: Juha Niskanen <juha.niska...@haltian.com> AuthorDate: Thu Oct 29 13:50:10 2020 +0200 arch/arm/src/stm32l4/stm32l4_adc.c: fix copy-paste mistake with CONFIG_STM32L4_ADC1_DMA_CFG Signed-off-by: Juha Niskanen <juha.niska...@haltian.com> --- arch/arm/src/stm32l4/stm32l4_adc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/src/stm32l4/stm32l4_adc.c b/arch/arm/src/stm32l4/stm32l4_adc.c index 4b43a90..6e9882c 100644 --- a/arch/arm/src/stm32l4/stm32l4_adc.c +++ b/arch/arm/src/stm32l4/stm32l4_adc.c @@ -414,7 +414,7 @@ static struct stm32_dev_s g_adcpriv1 = .intf = 1, #ifdef HAVE_ADC_RESOLUTION .resolution = CONFIG_STM32L4_ADC1_RESOLUTION, -#endif +#endif .base = STM32L4_ADC1_BASE, #if defined(ADC1_HAVE_TIMER) || defined(ADC1_HAVE_EXTCFG) .extcfg = ADC1_EXTCFG_VALUE, @@ -476,7 +476,7 @@ static struct stm32_dev_s g_adcpriv2 = #endif #ifdef ADC2_HAVE_DMA .dmachan = ADC2_DMA_CHAN, - .dmacfg = CONFIG_STM32L4_ADC1_DMA_CFG, + .dmacfg = CONFIG_STM32L4_ADC2_DMA_CFG, .hasdma = true, #endif #ifdef ADC2_HAVE_DFSDM @@ -512,7 +512,7 @@ static struct stm32_dev_s g_adcpriv3 = .intf = 3, #ifdef HAVE_ADC_RESOLUTION .resolution = CONFIG_STM32L4_ADC3_RESOLUTION, -#endif +#endif .base = STM32L4_ADC3_BASE, #if defined(ADC3_HAVE_TIMER) || defined(ADC3_HAVE_EXTCFG) .extcfg = ADC3_EXTCFG_VALUE, @@ -525,7 +525,7 @@ static struct stm32_dev_s g_adcpriv3 = #endif #ifdef ADC3_HAVE_DMA .dmachan = ADC3_DMA_CHAN, - .dmacfg = CONFIG_STM32L4_ADC1_DMA_CFG, + .dmacfg = CONFIG_STM32L4_ADC3_DMA_CFG, .hasdma = true, #endif #ifdef ADC3_HAVE_DFSDM @@ -2467,4 +2467,4 @@ struct adc_dev_s *stm32l4_adc_initialize(int intf, FAR } #endif /* CONFIG_STM32L4_ADC1 || CONFIG_STM32L4_ADC2 || CONFIG_STM32L4_ADC3 */ -#endif /* CONFIG_ADC */ \ No newline at end of file +#endif /* CONFIG_ADC */