Merge pull request #9512 from jflyper/bfdev-f7-dma-clock-enable-refactor

[F7] Refactor enableDmaClock with RCC_ClockCmd
This commit is contained in:
Michael Keller 2020-02-25 23:55:25 +13:00 committed by GitHub
commit 3999b09ffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions

View File

@ -28,7 +28,8 @@
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "resource.h" #include "drivers/rcc.h"
#include "drivers/resource.h"
/* /*
* DMA descriptors. * DMA descriptors.
@ -76,14 +77,7 @@ DEFINE_DMA_IRQ_HANDLER(2, 7, DMA2_ST7_HANDLER)
static void enableDmaClock(int index) static void enableDmaClock(int index)
{ {
const uint32_t rcc = dmaDescriptors[index].dma == DMA1 ? RCC_AHB1ENR_DMA1EN : RCC_AHB1ENR_DMA2EN; RCC_ClockCmd(dmaDescriptors[index].dma == DMA1 ? RCC_AHB1(DMA1) : RCC_AHB1(DMA2), ENABLE);
do {
__IO uint32_t tmpreg;
SET_BIT(RCC->AHB1ENR, rcc);
/* Delay after an RCC peripheral clock enabling */
tmpreg = READ_BIT(RCC->AHB1ENR, rcc);
UNUSED(tmpreg);
} while (0);
} }
void dmaInit(dmaIdentifier_e identifier, resourceOwner_e owner, uint8_t resourceIndex) void dmaInit(dmaIdentifier_e identifier, resourceOwner_e owner, uint8_t resourceIndex)