From 7065f78b926e9c6c2cbe794829958dcba784af5b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 8 Sep 2015 08:18:01 -0600 Subject: [PATCH] Eliminate a warning --- arch/arm/src/stm32/stm32_adc.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c index 73cbe624b2..14b52df600 100644 --- a/arch/arm/src/stm32/stm32_adc.c +++ b/arch/arm/src/stm32/stm32_adc.c @@ -114,6 +114,12 @@ #define ADC_MAX_CHANNELS_DMA 16 #define ADC_MAX_CHANNELS_NODMA 1 +#ifdef ADC_HAVE_DMA +# define ADC_MAX_SAMPLES ADC_MAX_CHANNELS_DMA +#else +# define ADC_MAX_SAMPLES ADC_MAX_CHANNELS_NODMA +#endif + /* DMA channels and interface values differ for the F1 and F4 families */ #if defined(CONFIG_STM32_STM32L15XX) @@ -167,18 +173,14 @@ struct stm32_dev_s #ifdef ADC_HAVE_DMA DMA_HANDLE dma; /* Allocated DMA channel */ - /* List of selected DMA channels to sample */ - - uint8_t chanlist[ADC_MAX_CHANNELS_DMA]; - /* DMA transfer buffer */ - uint16_t dmabuffer[ADC_MAX_CHANNELS_DMA]; -#else - /* List of selected DMA channels to sample */ - - uint8_t chanlist[ADC_MAX_CHANNELS_NODMA]; + uint16_t dmabuffer[ADC_MAX_SAMPLES]; #endif + + /* List of selected ADC channels to sample */ + + uint8_t chanlist[ADC_MAX_SAMPLES]; }; /****************************************************************************