Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-09-07 09:26:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

arch/arm/src/stm32/stm32_adc.h: move generalized ADC definitions to the header file

Browse source
This commit is contained in:
raiden00pl 2020-04-21 21:46:14 +02:00 • committed by patacongo
parent 0e09d162e2
commit 1b4e0fddb8
2 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

39
arch/arm/src/stm32/stm32_adc.c
View file

@ -159,45 +159,6 @@
# define RCC_RSTR_ADC34RST RCC_AHBRSTR_ADC34RST
#endif
/* ADC interrupts ***********************************************************/
#if defined(HAVE_IP_ADC_V1)
# define STM32_ADC_DMAREG_OFFSET STM32_ADC_CR2_OFFSET
# define ADC_DMAREG_DMA ADC_CR2_DMA
# define STM32_ADC_EXTREG_OFFSET STM32_ADC_CR2_OFFSET
# define ADC_EXTREG_EXTSEL_MASK ADC_CR2_EXTSEL_MASK
# define STM32_ADC_JEXTREG_OFFSET STM32_ADC_CR2_OFFSET
# define ADC_JEXTREG_JEXTSEL_MASK ADC_CR2_JEXTSEL_MASK
# define STM32_ADC_ISR_OFFSET STM32_ADC_SR_OFFSET
# define STM32_ADC_IER_OFFSET STM32_ADC_CR1_OFFSET
# ifdef HAVE_BASIC_ADC
# define ADC_EXTREG_EXTEN_MASK ADC_CR2_EXTTRIG
# define ADC_EXTREG_EXTEN_NONE 0
# define ADC_EXTREG_EXTEN_DEFAULT ADC_CR2_EXTTRIG
# define ADC_JEXTREG_JEXTEN_MASK ADC_CR2_JEXTTRIG
# define ADC_JEXTREG_JEXTEN_NONE 0
# define ADC_JEXTREG_JEXTEN_DEFAULT ADC_CR2_JEXTTRIG
# else
# define ADC_EXTREG_EXTEN_MASK ADC_CR2_EXTEN_MASK
# define ADC_EXTREG_EXTEN_NONE ADC_CR2_EXTEN_NONE
# define ADC_EXTREG_EXTEN_DEFAULT ADC_CR2_EXTEN_RISING
# define ADC_JEXTREG_JEXTEN_MASK ADC_CR2_JEXTEN_MASK
# define ADC_JEXTREG_JEXTEN_NONE ADC_CR2_JEXTEN_NONE
# define ADC_JEXTREG_JEXTEN_DEFAULT ADC_CR2_JEXTEN_RISING
# endif
#elif defined(HAVE_IP_ADC_V2)
# define STM32_ADC_DMAREG_OFFSET STM32_ADC_CFGR1_OFFSET
# define ADC_DMAREG_DMA ADC_CFGR1_DMAEN
# define STM32_ADC_EXTREG_OFFSET STM32_ADC_CFGR1_OFFSET
# define ADC_EXTREG_EXTSEL_MASK ADC_CFGR1_EXTSEL_MASK
# define ADC_EXTREG_EXTEN_MASK ADC_CFGR1_EXTEN_MASK
# define ADC_EXTREG_EXTEN_DEFAULT ADC_CFGR1_EXTEN_RISING
# define STM32_ADC_JEXTREG_OFFSET STM32_ADC_JSQR_OFFSET
# define ADC_JEXTREG_JEXTSEL_MASK ADC_JSQR_JEXTSEL_MASK
# define ADC_JEXTREG_JEXTEN_MASK ADC_JSQR_JEXTEN_MASK
# define ADC_JEXTREG_JEXTEN_DEFAULT ADC_JSQR_JEXTEN_RISING
#endif
/* ADC Channels/DMA *********************************************************/
/* The maximum number of channels that can be sampled. If DMA support is

39
arch/arm/src/stm32/stm32_adc.h
View file

@ -54,6 +54,45 @@
* Pre-processor Definitions
************************************************************************************/
/* Generalized definitions for ADC *************************************************/
#if defined(HAVE_IP_ADC_V1)
# define STM32_ADC_DMAREG_OFFSET STM32_ADC_CR2_OFFSET
# define ADC_DMAREG_DMA ADC_CR2_DMA
# define STM32_ADC_EXTREG_OFFSET STM32_ADC_CR2_OFFSET
# define ADC_EXTREG_EXTSEL_MASK ADC_CR2_EXTSEL_MASK
# define STM32_ADC_JEXTREG_OFFSET STM32_ADC_CR2_OFFSET
# define ADC_JEXTREG_JEXTSEL_MASK ADC_CR2_JEXTSEL_MASK
# define STM32_ADC_ISR_OFFSET STM32_ADC_SR_OFFSET
# define STM32_ADC_IER_OFFSET STM32_ADC_CR1_OFFSET
# ifdef HAVE_BASIC_ADC
# define ADC_EXTREG_EXTEN_MASK ADC_CR2_EXTTRIG
# define ADC_EXTREG_EXTEN_NONE 0
# define ADC_EXTREG_EXTEN_DEFAULT ADC_CR2_EXTTRIG
# define ADC_JEXTREG_JEXTEN_MASK ADC_CR2_JEXTTRIG
# define ADC_JEXTREG_JEXTEN_NONE 0
# define ADC_JEXTREG_JEXTEN_DEFAULT ADC_CR2_JEXTTRIG
# else
# define ADC_EXTREG_EXTEN_MASK ADC_CR2_EXTEN_MASK
# define ADC_EXTREG_EXTEN_NONE ADC_CR2_EXTEN_NONE
# define ADC_EXTREG_EXTEN_DEFAULT ADC_CR2_EXTEN_RISING
# define ADC_JEXTREG_JEXTEN_MASK ADC_CR2_JEXTEN_MASK
# define ADC_JEXTREG_JEXTEN_NONE ADC_CR2_JEXTEN_NONE
# define ADC_JEXTREG_JEXTEN_DEFAULT ADC_CR2_JEXTEN_RISING
# endif
#elif defined(HAVE_IP_ADC_V2)
# define STM32_ADC_DMAREG_OFFSET STM32_ADC_CFGR1_OFFSET
# define ADC_DMAREG_DMA ADC_CFGR1_DMAEN
# define STM32_ADC_EXTREG_OFFSET STM32_ADC_CFGR1_OFFSET
# define ADC_EXTREG_EXTSEL_MASK ADC_CFGR1_EXTSEL_MASK
# define ADC_EXTREG_EXTEN_MASK ADC_CFGR1_EXTEN_MASK
# define ADC_EXTREG_EXTEN_DEFAULT ADC_CFGR1_EXTEN_RISING
# define STM32_ADC_JEXTREG_OFFSET STM32_ADC_JSQR_OFFSET
# define ADC_JEXTREG_JEXTSEL_MASK ADC_JSQR_JEXTSEL_MASK
# define ADC_JEXTREG_JEXTEN_MASK ADC_JSQR_JEXTEN_MASK
# define ADC_JEXTREG_JEXTEN_DEFAULT ADC_JSQR_JEXTEN_RISING
#endif
/* Configuration ********************************************************************/
/* Timer devices may be used for different purposes. One special purpose is to