diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2019-10-01 19:50:42 +0200 |
|---|---|---|
| committer | Fabien Poussin <fabien.poussin@gmail.com> | 2019-10-01 19:50:42 +0200 |
| commit | f9f0c2d10cc7192639f85da017cbdb83ab6a9afa (patch) | |
| tree | bc09f709bfa5d159c61081c2d90c692089ac21c2 /os | |
| parent | 2204395064d06f3683881b41b97e4343103371d3 (diff) | |
| download | ChibiOS-Contrib-f9f0c2d10cc7192639f85da017cbdb83ab6a9afa.tar.gz ChibiOS-Contrib-f9f0c2d10cc7192639f85da017cbdb83ab6a9afa.tar.bz2 ChibiOS-Contrib-f9f0c2d10cc7192639f85da017cbdb83ab6a9afa.zip | |
Fixed DMA for 19.1.x
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.c | 2 | ||||
| -rwxr-xr-x | os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.c | 2 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.c | 10 | ||||
| -rw-r--r-- | os/various/fatfs_bindings/fatfs.mk | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.c b/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.c index b1dde2f..a54290e 100644 --- a/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.c +++ b/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.c @@ -303,7 +303,7 @@ void comp_ext_lld_channel_enable(COMPDriver *compp, uint32_t channel) { if (channel < 32) { #endif /* Masked out lines must not be touched by this driver.*/ - if ((cmask & STM32_EXTI_IMR_MASK) != 0U) { + if ((cmask & STM32_EXTI_IMR1_MASK) != 0U) { return; } diff --git a/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.c b/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.c index 882022b..993a3ab 100755 --- a/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.c +++ b/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.c @@ -235,7 +235,7 @@ void crc_lld_start(CRCDriver *crcp) { */ void crc_lld_stop(CRCDriver *crcp) { #if CRC_USE_DMA == TRUE - dmaStreamRelease(crcp->dma); + dmaStreamFree(crcp->dma); #else (void)crcp; #endif diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.c b/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.c index 5729f92..cc6dc20 100644 --- a/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.c +++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.c @@ -328,10 +328,10 @@ void nand_lld_start(NANDDriver *nandp) { fsmc_start(&FSMCD1); if (nandp->state == NAND_STOP) { - b = dmaStreamAllocate(nandp->dma, - STM32_EMC_FSMC1_IRQ_PRIORITY, - (stm32_dmaisr_t)nand_lld_serve_transfer_end_irq, - (void *)nandp); + b = dmaStreamAlloc(nandp->dma, + STM32_EMC_FSMC1_IRQ_PRIORITY, + (stm32_dmaisr_t)nand_lld_serve_transfer_end_irq, + (void *)nandp); osalDbgAssert(!b, "stream already allocated"); #if AHB_TRANSACTION_WIDTH == 4 @@ -377,7 +377,7 @@ void nand_lld_start(NANDDriver *nandp) { void nand_lld_stop(NANDDriver *nandp) { if (nandp->state == NAND_READY) { - dmaStreamRelease(nandp->dma); + dmaStreamFree(nandp->dma); nandp->nand->PCR &= ~FSMC_PCR_PBKEN; nand_ready_isr_disable(nandp); nandp->isr_handler = NULL; diff --git a/os/various/fatfs_bindings/fatfs.mk b/os/various/fatfs_bindings/fatfs.mk index 2a3b4d6..7548acf 100644 --- a/os/various/fatfs_bindings/fatfs.mk +++ b/os/various/fatfs_bindings/fatfs.mk @@ -4,7 +4,7 @@ FATFSSRC = ${CHIBIOS_CONTRIB}/os/various/fatfs_bindings/fatfs_diskio.c \ ${CHIBIOS}/ext/fatfs/src/ff.c \ $(CHIBIOS)/ext/fatfs/src/ffunicode.c -FATFSINC = ${CHIBIOS}/ext/fatfs/src +FATFSINC = ${CHIBIOS}/ext/fatfs/src ${CHIBIOS_CONTRIB}/os/various/fatfs_bindings # Shared variables ALLCSRC += $(FATFSSRC) |