djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/dma: Reinitialise the DMA if the direction changed on the channel.

This commit is contained in:
Damien George 2018-09-11 17:19:55 +10:00
parent b0c8a94b41
commit d7e2ac4a6a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/stm32/dma.c
View File

@ -551,9 +551,9 @@ void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir
HAL_DMA_Init(dma); HAL_DMA_Init(dma);
NVIC_SetPriority(IRQn_NONNEG(dma_irqn[dma_id]), IRQ_PRI_DMA); NVIC_SetPriority(IRQn_NONNEG(dma_irqn[dma_id]), IRQ_PRI_DMA);
#else #else
// if this stream was previously configured for this channel/request then we // if this stream was previously configured for this channel/request and direction then we
// can skip most of the initialisation // can skip most of the initialisation
uint8_t sub_inst = DMA_SUB_INSTANCE_AS_UINT8(dma_descr->sub_instance); uint8_t sub_inst = DMA_SUB_INSTANCE_AS_UINT8(dma_descr->sub_instance) | (dir == DMA_PERIPH_TO_MEMORY) << 7;
if (dma_last_sub_instance[dma_id] != sub_inst) { if (dma_last_sub_instance[dma_id] != sub_inst) {
dma_last_sub_instance[dma_id] = sub_inst; dma_last_sub_instance[dma_id] = sub_inst;
@ -596,7 +596,8 @@ void dma_deinit(const dma_descr_t *dma_descr) {
void dma_invalidate_channel(const dma_descr_t *dma_descr) { void dma_invalidate_channel(const dma_descr_t *dma_descr) {
if (dma_descr != NULL) { if (dma_descr != NULL) {
dma_id_t dma_id = dma_descr->id; dma_id_t dma_id = dma_descr->id;
if (dma_last_sub_instance[dma_id] == DMA_SUB_INSTANCE_AS_UINT8(dma_descr->sub_instance) ) { // Only compare the sub-instance, not the direction bit (MSB)
if ((dma_last_sub_instance[dma_id] & 0x7f) == DMA_SUB_INSTANCE_AS_UINT8(dma_descr->sub_instance) ) {
dma_last_sub_instance[dma_id] = DMA_INVALID_CHANNEL; dma_last_sub_instance[dma_id] = DMA_INVALID_CHANNEL;
} }
} }