Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 15:25:36 +03:00
Code Issues Wiki Activity

Unify DMA stream and channel handling

Browse source
This commit is contained in:
jflyper 2019-07-14 15:59:07 +09:00
parent e8125e57c9
commit 7ddfd7dea6
40 changed files with 421 additions and 446 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/drivers/adc_stm32f7xx.c
View file

@ -63,7 +63,7 @@ const adcDevice_t adcHardware[] = {
.ADCx = ADC1,
.rccADC = RCC_APB2(ADC1),
#if !defined(USE_DMA_SPEC)
.DMAy_Streamx = ADC1_DMA_STREAM,
.dmaResource = (dmaResource_t *)ADC1_DMA_STREAM,
.channel = DMA_CHANNEL_0
#endif
},
@ -71,7 +71,7 @@ const adcDevice_t adcHardware[] = {
.ADCx = ADC2,
.rccADC = RCC_APB2(ADC2),
#if !defined(USE_DMA_SPEC)
.DMAy_Streamx = ADC2_DMA_STREAM,
.dmaResource = (dmaResource_t *)ADC2_DMA_STREAM,
.channel = DMA_CHANNEL_1
#endif
},
@ -79,7 +79,7 @@ const adcDevice_t adcHardware[] = {
.ADCx = ADC3,
.rccADC = RCC_APB2(ADC3),
#if !defined(USE_DMA_SPEC)
.DMAy_Streamx = ADC3_DMA_STREAM,
.dmaResource = (dmaResource_t *)ADC3_DMA_STREAM,
.channel = DMA_CHANNEL_2
#endif
}
@ -314,11 +314,11 @@ void adcInit(const adcConfig_t *config)
dmaInit(dmaGetIdentifier(dmaspec->ref), OWNER_ADC, 0);
adc.DmaHandle.Init.Channel = dmaspec->channel;
adc.DmaHandle.Instance = dmaspec->ref;
adc.DmaHandle.Instance = (DMA_ARCH_TYPE *)dmaspec->ref;
#else
dmaInit(dmaGetIdentifier(adc.DMAy_Streamx), OWNER_ADC, 0);
dmaInit(dmaGetIdentifier(adc.dmaResource), OWNER_ADC, 0);
adc.DmaHandle.Init.Channel = adc.channel;
adc.DmaHandle.Instance = adc.DMAy_Streamx;
adc.DmaHandle.Instance = (DMA_ARCH_TYPE *)adc.dmaResource;
#endif
adc.DmaHandle.Init.Direction = DMA_PERIPH_TO_MEMORY;