diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a66d8b11275..0b44c79f2b2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -226,7 +226,6 @@ config ARCH_CHIP_STR71X config ARCH_CHIP_MOXART bool "MoxART" select ARCH_ARM7TDMI - select ARCH_HAVE_RAMVECTORS select ARCH_HAVE_RESET ---help--- MoxART family diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c index a0434cdb083..ef154b4027a 100644 --- a/arch/arm/src/stm32/stm32_adc.c +++ b/arch/arm/src/stm32/stm32_adc.c @@ -1511,7 +1511,7 @@ static void adc_reset(FAR struct adc_dev_s *dev) { adbg("Error initializing the timers\n"); } -#else +#elif !defined(CONFIG_ADC_NO_STARTUP_CONV) #ifdef CONFIG_STM32_STM32F10XX /* Set ADON (Again) to start the conversion. Only if Timers are not @@ -1519,10 +1519,10 @@ static void adc_reset(FAR struct adc_dev_s *dev) */ adc_enable(priv, true); - -#elif !defined(CONFIG_ADC_NO_STARTUP_CONV) +#else adc_startconv(priv, true); #endif /* CONFIG_STM32_STM32F10XX */ + #endif /* ADC_HAVE_TIMER */ irqrestore(flags); @@ -2085,10 +2085,10 @@ static int adc_set_ch_idx(FAR struct adc_dev_s *dev, uint8_t idx) } /**************************************************************************** - * Name: adc_set_channel + * Name: adc_set_ch * * Description: - * All ioctl calls will be routed through this method. + * Sets the ADC channel. * * Input Parameters: * dev - pointer to device structure used by the driver