andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed some dead code. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13339 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2020-02-08 17:36:32 +00:00
parent 060eda1403
commit 3b08e1d566
2 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c
View File

@ -468,11 +468,7 @@ void adc_lld_init(void) {
#if STM32_ADC_DUAL_MODE #if STM32_ADC_DUAL_MODE
ADCD1.adcs = ADC2; ADCD1.adcs = ADC2;
#endif #endif
#if STM32_DMA_SUPPORTS_DMAMUX
ADCD1.dmastp = NULL; ADCD1.dmastp = NULL;
#else
ADCD1.dmastp = STM32_DMA_STREAM(STM32_ADC_ADC1_DMA_STREAM);
#endif
ADCD1.dmamode = ADC_DMA_SIZE | ADCD1.dmamode = ADC_DMA_SIZE |
STM32_DMA_CR_PL(STM32_ADC_ADC1_DMA_PRIORITY) | STM32_DMA_CR_PL(STM32_ADC_ADC1_DMA_PRIORITY) |
STM32_DMA_CR_DIR_P2M | STM32_DMA_CR_DIR_P2M |
@ -491,11 +487,7 @@ void adc_lld_init(void) {
ADCD2.adcc = ADC123_COMMON; ADCD2.adcc = ADC123_COMMON;
#endif #endif
ADCD2.adcm = ADC2; ADCD2.adcm = ADC2;
#if STM32_DMA_SUPPORTS_DMAMUX
ADCD2.dmastp = NULL; ADCD2.dmastp = NULL;
#else
ADCD2.dmastp = STM32_DMA_STREAM(STM32_ADC_ADC2_DMA_STREAM);
#endif
ADCD2.dmamode = ADC_DMA_SIZE | ADCD2.dmamode = ADC_DMA_SIZE |
STM32_DMA_CR_PL(STM32_ADC_ADC2_DMA_PRIORITY) | STM32_DMA_CR_PL(STM32_ADC_ADC2_DMA_PRIORITY) |
STM32_DMA_CR_DIR_P2M | STM32_DMA_CR_DIR_P2M |
@ -519,11 +511,7 @@ void adc_lld_init(void) {
#if STM32_ADC_DUAL_MODE #if STM32_ADC_DUAL_MODE
ADCD3.adcs = ADC4; ADCD3.adcs = ADC4;
#endif #endif
#if STM32_DMA_SUPPORTS_DMAMUX
ADCD3.dmastp = NULL; ADCD3.dmastp = NULL;
#else
ADCD3.dmastp = STM32_DMA_STREAM(STM32_ADC_ADC3_DMA_STREAM);
#endif
ADCD3.dmamode = ADC_DMA_SIZE | ADCD3.dmamode = ADC_DMA_SIZE |
STM32_DMA_CR_PL(STM32_ADC_ADC3_DMA_PRIORITY) | STM32_DMA_CR_PL(STM32_ADC_ADC3_DMA_PRIORITY) |
STM32_DMA_CR_DIR_P2M | STM32_DMA_CR_DIR_P2M |
@ -540,11 +528,7 @@ void adc_lld_init(void) {
ADCD4.adcc = ADC345_COMMON; ADCD4.adcc = ADC345_COMMON;
#endif #endif
ADCD4.adcm = ADC4; ADCD4.adcm = ADC4;
#if STM32_DMA_SUPPORTS_DMAMUX
ADCD4.dmastp = NULL; ADCD4.dmastp = NULL;
#else
ADCD4.dmastp = STM32_DMA_STREAM(STM32_ADC_ADC4_DMA_STREAM);
#endif
ADCD4.dmamode = ADC_DMA_SIZE | ADCD4.dmamode = ADC_DMA_SIZE |
STM32_DMA_CR_PL(STM32_ADC_ADC4_DMA_PRIORITY) | STM32_DMA_CR_PL(STM32_ADC_ADC4_DMA_PRIORITY) |
STM32_DMA_CR_DIR_P2M | STM32_DMA_CR_DIR_P2M |

22
os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h
View File

@ -444,7 +444,7 @@
#error "ADC driver activated but no ADC peripheral assigned" #error "ADC driver activated but no ADC peripheral assigned"
#endif #endif
/* ISR arrangments checks.*/ /* ISR arrangements checks.*/
#if STM32_HAS_ADC1 && STM32_HAS_ADC2 #if STM32_HAS_ADC1 && STM32_HAS_ADC2
#if STM32_ADC1_NUMBER != STM32_ADC2_NUMBER #if STM32_ADC1_NUMBER != STM32_ADC2_NUMBER
#error "ADCv3 driver expects STM32_ADC1_NUMBER == STM32_ADC2_NUMBER from registry" #error "ADCv3 driver expects STM32_ADC1_NUMBER == STM32_ADC2_NUMBER from registry"
@ -558,26 +558,6 @@
#endif /* !STM32_DMA_SUPPORTS_DMAMUX */ #endif /* !STM32_DMA_SUPPORTS_DMAMUX */
#if STM32_ADC_USE_ADC1 && \
!STM32_DMA_IS_VALID_PRIORITY(STM32_ADC_ADC1_DMA_PRIORITY)
#error "Invalid DMA priority assigned to ADC1"
#endif
#if STM32_ADC_USE_ADC2 && \
!STM32_DMA_IS_VALID_PRIORITY(STM32_ADC_ADC2_DMA_PRIORITY)
#error "Invalid DMA priority assigned to ADC2"
#endif
#if STM32_ADC_USE_ADC3 && \
!STM32_DMA_IS_VALID_PRIORITY(STM32_ADC_ADC3_DMA_PRIORITY)
#error "Invalid DMA priority assigned to ADC3"
#endif
#if STM32_ADC_USE_ADC4 && \
!STM32_DMA_IS_VALID_PRIORITY(STM32_ADC_ADC4_DMA_PRIORITY)
#error "Invalid DMA priority assigned to ADC4"
#endif
/* ADC clock source checks.*/ /* ADC clock source checks.*/
#if defined(STM32F3XX) #if defined(STM32F3XX)
#if STM32_ADC_ADC12_CLOCK_MODE == ADC_CCR_CKMODE_ADCCK #if STM32_ADC_ADC12_CLOCK_MODE == ADC_CCR_CKMODE_ADCCK