Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / stmf0 / ao_dma_stm.c

diff --git a/src/stmf0/ao_dma_stm.c b/src/stmf0/ao_dma_stm.c
index 7045514cd206d51adc53f0390c30b383afab9ce4..ef551786d62b8d9073a517065a30a81370099f80 100644 (file)
--- a/src/stmf0/ao_dma_stm.c
+++ b/src/stmf0/ao_dma_stm.c
@@ -64,7 +64,7 @@ void stm_dma_ch2_3_isr(void) {
                   ch_mask(STM_DMA_INDEX(3)));
 }
 
-void stm_dma1_ch4_5_6_isr(void) {
+void stm_dma_ch4_5_6_isr(void) {
        ao_dma_isr(STM_DMA_INDEX(4), STM_DMA_INDEX(6),
                   ch_mask(STM_DMA_INDEX(4)) |
                   ch_mask(STM_DMA_INDEX(5)) |
@@ -111,10 +111,10 @@ ao_dma_start(uint8_t index)
 void
 ao_dma_done_transfer(uint8_t index)
 {
-       stm_dma.channel[index].ccr &= ~(1 << STM_DMA_CCR_EN);
+       stm_dma.channel[index].ccr &= ~(1UL << STM_DMA_CCR_EN);
        ao_arch_critical(
                if (--ao_dma_active == 0)
-                       stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_DMAEN);
+                       stm_rcc.ahbenr &= ~(1UL << STM_RCC_AHBENR_DMAEN);
                );
        if (ao_dma_allocated[index])
                ao_dma_mutex[index] = 0;
@@ -125,7 +125,7 @@ ao_dma_done_transfer(uint8_t index)
 void
 ao_dma_abort(uint8_t index)
 {
-       stm_dma.channel[index].ccr &= ~(1 << STM_DMA_CCR_EN);
+       stm_dma.channel[index].ccr &= ~(1UL << STM_DMA_CCR_EN);
        ao_wakeup(&ao_dma_done[index]);
 }