aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Sarkies2012-11-30 06:39:57 +1030
committerKen Sarkies2013-01-08 08:16:25 +1030
commita60ae5044c9d885d6d0152b0907c21977e8a0d6b (patch)
tree325c3dfbcf5776afbfb8d174ac83e98f995db82f
parent4d234c7e27fad516f1a34698099982d7e9ced260 (diff)
STM32 DMA: replaced F4 header to match that for F2, and move header and source files to common.
In the header: - Fix DMA_SxCR_CT: change shift from 18 to 19 For use with the convenience functions: - Added DMA_SxCR_CHSEL generic values - Added DMA_STREAM - generic values - Added dma_if_offset - rather than separating out LISR and HISR - Added masks - Added dma_disable_double_buffer_mode()
-rw-r--r--doc/stm32f2/Doxyfile12
-rw-r--r--doc/stm32f4/Doxyfile12
-rw-r--r--include/libopencm3/stm32/common/dma_common_f24.h604
-rw-r--r--include/libopencm3/stm32/dma.h31
-rw-r--r--include/libopencm3/stm32/f2/dma.h408
-rw-r--r--include/libopencm3/stm32/f4/dma.h662
-rw-r--r--lib/stm32/common/dma_common_f24.c780
-rw-r--r--lib/stm32/f2/Makefile2
-rw-r--r--lib/stm32/f2/dma.c28
-rw-r--r--lib/stm32/f4/Makefile2
-rw-r--r--lib/stm32/f4/dma.c754
11 files changed, 1484 insertions, 1811 deletions
diff --git a/doc/stm32f2/Doxyfile b/doc/stm32f2/Doxyfile
index ff5765b..d03f4e9 100644
--- a/doc/stm32f2/Doxyfile
+++ b/doc/stm32f2/Doxyfile
@@ -7,7 +7,7 @@
# Common Include File
#---------------------------------------------------------------------------
-@INCLUDE = ../Doxyfile_common
+@INCLUDE = ../Doxyfile_common
#---------------------------------------------------------------------------
# Local settings
@@ -16,17 +16,15 @@
WARN_LOGFILE = doxygen_stm32f2.log
INPUT = ../../include/libopencm3/license.dox \
- ../../include/libopencm3/stm32/f2 \
- ../../include/libopencm3/stm32/common/gpio_common_all.h \
- ../../include/libopencm3/stm32/common/gpio_common_f24.h
+ ../../include/libopencm3/stm32/f2 \
+ ../../include/libopencm3/stm32/common
INPUT += ../../lib/stm32/f2 \
- ../../lib/stm32/common/gpio_common_all.c \
- ../../lib/stm32/common/gpio_common_f24.c
+ ../../lib/stm32/common
EXCLUDE =
-LAYOUT_FILE = DoxygenLayout_stm32f2.xml
+LAYOUT_FILE = DoxygenLayout_stm32f2.xml
TAGFILES = ../cm3/cm3.tag=../../cm3/html
diff --git a/doc/stm32f4/Doxyfile b/doc/stm32f4/Doxyfile
index 6eff41c..eee41e9 100644
--- a/doc/stm32f4/Doxyfile
+++ b/doc/stm32f4/Doxyfile
@@ -7,7 +7,7 @@
# Common Include File
#---------------------------------------------------------------------------
-@INCLUDE = ../Doxyfile_common
+@INCLUDE = ../Doxyfile_common
#---------------------------------------------------------------------------
# Local settings
@@ -16,17 +16,15 @@
WARN_LOGFILE = doxygen_stm32f4.log
INPUT = ../../include/libopencm3/license.dox \
- ../../include/libopencm3/stm32/f4 \
- ../../include/libopencm3/stm32/common/gpio_common_all.h \
- ../../include/libopencm3/stm32/common/gpio_common_f24.h
+ ../../include/libopencm3/stm32/f4 \
+ ../../include/libopencm3/stm32/common
INPUT += ../../lib/stm32/f4 \
- ../../lib/stm32/common/gpio_common_all.c \
- ../../lib/stm32/common/gpio_common_f24.c
+ ../../lib/stm32/common
EXCLUDE =
-LAYOUT_FILE = DoxygenLayout_stm32f4.xml
+LAYOUT_FILE = DoxygenLayout_stm32f4.xml
TAGFILES = ../cm3/cm3.tag=../../cm3/html
diff --git a/include/libopencm3/stm32/common/dma_common_f24.h b/include/libopencm3/stm32/common/dma_common_f24.h
new file mode 100644
index 0000000..3db3d26
--- /dev/null
+++ b/include/libopencm3/stm32/common/dma_common_f24.h
@@ -0,0 +1,604 @@
+/** @addtogroup dma_defines */
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ * Copyright (C) 2012 Ken Sarkies <ksarkies@internode.on.net>
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA DMA.H */
+
+#ifndef LIBOPENCM3_DMA_COMMON_F24_H
+#define LIBOPENCM3_DMA_COMMON_F24_H
+
+/**@{*/
+
+#include <libopencm3/cm3/common.h>
+
+/* --- Convenience macros -------------------------------------------------- */
+
+/* DMA controller base addresses (for convenience) */
+#define DMA1 DMA1_BASE
+#define DMA2 DMA2_BASE
+
+/* DMA stream base addresses (for API parameters) */
+/** @defgroup dma_st_number DMA Stream Number
+@ingroup STM32F4xx_dma_defines
+
+@{*/
+#define DMA_STREAM0 0
+#define DMA_STREAM1 1
+#define DMA_STREAM2 2
+#define DMA_STREAM3 3
+#define DMA_STREAM4 4
+#define DMA_STREAM5 5
+#define DMA_STREAM6 6
+#define DMA_STREAM7 7
+/**@}*/
+
+#define DMA_STREAM(port, n) ((port) + 0x10 + (24 * (n)))
+#define DMA1_STREAM(n) DMA_STREAM(DMA1, n)
+#define DMA2_STREAM(n) DMA_STREAM(DMA2, n)
+
+#define DMA1_STREAM0 DMA1_STREAM(0)
+#define DMA1_STREAM1 DMA1_STREAM(1)
+#define DMA1_STREAM2 DMA1_STREAM(2)
+#define DMA1_STREAM3 DMA1_STREAM(3)
+#define DMA1_STREAM4 DMA1_STREAM(4)
+#define DMA1_STREAM5 DMA1_STREAM(5)
+#define DMA1_STREAM6 DMA1_STREAM(6)
+#define DMA1_STREAM7 DMA1_STREAM(7)
+
+#define DMA2_STREAM0 DMA2_STREAM(0)
+#define DMA2_STREAM1 DMA2_STREAM(1)
+#define DMA2_STREAM2 DMA2_STREAM(2)
+#define DMA2_STREAM3 DMA2_STREAM(3)
+#define DMA2_STREAM4 DMA2_STREAM(4)
+#define DMA2_STREAM5 DMA2_STREAM(5)
+#define DMA2_STREAM6 DMA2_STREAM(6)
+#define DMA2_STREAM7 DMA2_STREAM(7)
+
+/* --- DMA controller registers -------------------------------------------- */
+
+/* DMA low interrupt status register (DMAx_LISR) */
+#define DMA_LISR(port) MMIO32(port + 0x00)
+#define DMA1_LISR DMA_LISR(DMA1)
+#define DMA2_LISR DMA_LISR(DMA2)
+
+/* DMA high interrupt status register (DMAx_HISR) */
+#define DMA_HISR(port) MMIO32(port + 0x04)
+#define DMA1_HISR DMA_HISR(DMA1)
+#define DMA2_HISR DMA_HISR(DMA2)
+
+/* DMA low interrupt flag clear register (DMAx_LIFCR) */
+#define DMA_LIFCR(port) MMIO32(port + 0x08)
+#define DMA1_LIFCR DMA_LIFCR(DMA1)
+#define DMA2_LIFCR DMA_LIFCR(DMA2)
+
+/* DMA high interrupt flag clear register (DMAx_HIFCR) */
+#define DMA_HIFCR(port) MMIO32(port + 0x0C)
+#define DMA1_HIFCR DMA_HIFCR(DMA1)
+#define DMA2_HIFCR DMA_HIFCR(DMA2)
+
+/* --- DMA stream registers ------------------------------------------------ */
+
+/* DMA Stream x configuration register (DMA_SxCR) */
+#define DMA_SCR(port, n) MMIO32(DMA_STREAM(port, n) + 0x00)
+#define DMA1_SCR(n) DMA_SCR(DMA1, n)
+#define DMA2_SCR(n) DMA_SCR(DMA2, n)
+
+#define DMA1_S0CR DMA1_SCR(0)
+#define DMA1_S1CR DMA1_SCR(1)
+#define DMA1_S2CR DMA1_SCR(2)
+#define DMA1_S3CR DMA1_SCR(3)
+#define DMA1_S4CR DMA1_SCR(4)
+#define DMA1_S5CR DMA1_SCR(5)
+#define DMA1_S6CR DMA1_SCR(6)
+#define DMA1_S7CR DMA1_SCR(7)
+
+#define DMA2_S0CR DMA2_SCR(0)
+#define DMA2_S1CR DMA2_SCR(1)
+#define DMA2_S2CR DMA2_SCR(2)
+#define DMA2_S3CR DMA2_SCR(3)
+#define DMA2_S4CR DMA2_SCR(4)
+#define DMA2_S5CR DMA2_SCR(5)
+#define DMA2_S6CR DMA2_SCR(6)
+#define DMA2_S7CR DMA2_SCR(7)
+
+/* DMA Stream x number of data register (DMA_SxNDTR) */
+#define DMA_SNDTR(port, n) MMIO32(DMA_STREAM(port, n) + 0x04)
+#define DMA1_SNDTR(n) DMA_SNDTR(DMA1, n)
+#define DMA2_SNDTR(n) DMA_SNDTR(DMA2, n)
+
+#define DMA1_S0NDTR DMA1_SNDTR(0)
+#define DMA1_S1NDTR DMA1_SNDTR(1)
+#define DMA1_S2NDTR DMA1_SNDTR(2)
+#define DMA1_S3NDTR DMA1_SNDTR(3)
+#define DMA1_S4NDTR DMA1_SNDTR(4)
+#define DMA1_S5NDTR DMA1_SNDTR(5)
+#define DMA1_S6NDTR DMA1_SNDTR(6)
+#define DMA1_S7NDTR DMA1_SNDTR(7)
+
+#define DMA2_S0NDTR DMA2_SNDTR(0)
+#define DMA2_S1NDTR DMA2_SNDTR(1)
+#define DMA2_S2NDTR DMA2_SNDTR(2)
+#define DMA2_S3NDTR DMA2_SNDTR(3)
+#define DMA2_S4NDTR DMA2_SNDTR(4)
+#define DMA2_S5NDTR DMA2_SNDTR(5)
+#define DMA2_S6NDTR DMA2_SNDTR(6)
+#define DMA2_S7NDTR DMA2_SNDTR(7)
+
+/* DMA Stream x peripheral address register (DMA_SxPAR) */
+#define DMA_SPAR(port, n) *(volatile void **)(DMA_STREAM(port, n) + 0x08)
+#define DMA1_SPAR(n) DMA_SPAR(DMA1, n)
+#define DMA2_SPAR(n) DMA_SPAR(DMA2, n)
+
+#define DMA1_S0PAR DMA1_SPAR(0)
+#define DMA1_S1PAR DMA1_SPAR(1)
+#define DMA1_S2PAR DMA1_SPAR(2)
+#define DMA1_S3PAR DMA1_SPAR(3)
+#define DMA1_S4PAR DMA1_SPAR(4)
+#define DMA1_S5PAR DMA1_SPAR(5)
+#define DMA1_S6PAR DMA1_SPAR(6)
+#define DMA1_S7PAR DMA1_SPAR(7)
+
+#define DMA2_S0PAR DMA2_SPAR(0)
+#define DMA2_S1PAR DMA2_SPAR(1)
+#define DMA2_S2PAR DMA2_SPAR(2)
+#define DMA2_S3PAR DMA2_SPAR(3)
+#define DMA2_S4PAR DMA2_SPAR(4)
+#define DMA2_S5PAR DMA2_SPAR(5)
+#define DMA2_S6PAR DMA2_SPAR(6)
+#define DMA2_S7PAR DMA2_SPAR(7)
+
+/* DMA Stream x memory address 0 register (DMA_SxM0AR) */
+#define DMA_SM0AR(port, n) *(volatile void **)(DMA_STREAM(port, n) + 0x0c)
+#define DMA1_SM0AR(n) DMA_SM0AR(DMA1, n)
+#define DMA2_SM0AR(n) DMA_SM0AR(DMA2, n)
+
+#define DMA1_S0M0AR DMA1_SM0AR(0)
+#define DMA1_S1M0AR DMA1_SM0AR(1)
+#define DMA1_S2M0AR DMA1_SM0AR(2)
+#define DMA1_S3M0AR DMA1_SM0AR(3)
+#define DMA1_S4M0AR DMA1_SM0AR(4)
+#define DMA1_S5M0AR DMA1_SM0AR(5)
+#define DMA1_S6M0AR DMA1_SM0AR(6)
+#define DMA1_S7M0AR DMA1_SM0AR(7)
+
+#define DMA2_S0M0AR DMA2_SM0AR(0)
+#define DMA2_S1M0AR DMA2_SM0AR(1)
+#define DMA2_S2M0AR DMA2_SM0AR(2)
+#define DMA2_S3M0AR DMA2_SM0AR(3)
+#define DMA2_S4M0AR DMA2_SM0AR(4)
+#define DMA2_S5M0AR DMA2_SM0AR(5)
+#define DMA2_S6M0AR DMA2_SM0AR(6)
+#define DMA2_S7M0AR DMA2_SM0AR(7)
+
+/* DMA Stream x memory address 1 register (DMA_SxM1AR) */
+#define DMA_SM1AR(port, n) *(volatile void **)(DMA_STREAM(port, n) + 0x10)
+#define DMA1_SM1AR(n) DMA_SM1AR(DMA1, n)
+#define DMA2_SM1AR(n) DMA_SM1AR(DMA2, n)
+
+#define DMA1_S0M1AR DMA1_SM1AR(0)
+#define DMA1_S1M1AR DMA1_SM1AR(1)
+#define DMA1_S2M1AR DMA1_SM1AR(2)
+#define DMA1_S3M1AR DMA1_SM1AR(3)
+#define DMA1_S4M1AR DMA1_SM1AR(4)
+#define DMA1_S5M1AR DMA1_SM1AR(5)
+#define DMA1_S6M1AR DMA1_SM1AR(6)
+#define DMA1_S7M1AR DMA1_SM1AR(7)
+
+#define DMA2_S0M1AR DMA2_SM1AR(0)
+#define DMA2_S1M1AR DMA2_SM1AR(1)
+#define DMA2_S2M1AR DMA2_SM1AR(2)
+#define DMA2_S3M1AR DMA2_SM1AR(3)
+#define DMA2_S4M1AR DMA2_SM1AR(4)
+#define DMA2_S5M1AR DMA2_SM1AR(5)
+#define DMA2_S6M1AR DMA2_SM1AR(6)
+#define DMA2_S7M1AR DMA2_SM1AR(7)
+
+/* DMA Stream x FIFO control register (DMA_SxFCR) */
+#define DMA_SFCR(port, n) MMIO32(DMA_STREAM(port, n) + 0x14)
+#define DMA1_SFCR(n) DMA_SFCR(DMA1, n)
+#define DMA2_SFCR(n) DMA_SFCR(DMA2, n)
+
+#define DMA1_S0FCR DMA1_SFCR(0)
+#define DMA1_S1FCR DMA1_SFCR(1)
+#define DMA1_S2FCR DMA1_SFCR(2)
+#define DMA1_S3FCR DMA1_SFCR(3)
+#define DMA1_S4FCR DMA1_SFCR(4)
+#define DMA1_S5FCR DMA1_SFCR(5)
+#define DMA1_S6FCR DMA1_SFCR(6)
+#define DMA1_S7FCR DMA1_SFCR(7)
+
+#define DMA2_S0FCR DMA2_SFCR(0)
+#define DMA2_S1FCR DMA2_SFCR(1)
+#define DMA2_S2FCR DMA2_SFCR(2)
+#define DMA2_S3FCR DMA2_SFCR(3)
+#define DMA2_S4FCR DMA2_SFCR(4)
+#define DMA2_S5FCR DMA2_SFCR(5)
+#define DMA2_S6FCR DMA2_SFCR(6)
+#define DMA2_S7FCR DMA2_SFCR(7)
+
+/* --- DMA Interrupt Flag offset values ------------------------------------- */
+
+/* For API parameters. These are based on every interrupt flag and flag clear
+being at the same relative location */
+/** @defgroup dma_if_offset DMA Interrupt Flag Offsets within stream flag group.
+@ingroup dma_defines
+
+@{*/
+/** Transfer Complete Interrupt Flag */
+#define DMA_ISR_TCIF (1 << 5)
+/** Half Transfer Interrupt Flag */
+#define DMA_ISR_HTIF (1 << 4)
+/** Transfer Error Interrupt Flag */
+#define DMA_ISR_TEIF (1 << 3)
+/** Direct Mode Error Interrupt Flag */
+#define DMA_ISR_DMEIF (1 << 2)
+/** FIFO Error Interrupt Flag */
+#define DMA_ISR_FEIF (1 << 0)
+/**@}*/
+
+/* Offset within interrupt status register to start of stream interrupt flag field */
+#define DMA_ISR_OFFSET(stream) (6*(stream & 0x01)+16*((stream & 0x02) >> 1))
+#define DMA_ISR_FLAGS (DMA_ISR_TCIF | DMA_ISR_HTIF | DMA_ISR_TEIF | DMA_ISR_DMEIF | DMA_ISR_FEIF)
+#define DMA_ISR_MASK(stream) DMA_ISR_FLAGS << DMA_ISR_OFFSET(stream)
+
+/* --- DMA_LISR values ----------------------------------------------------- */
+
+#define DMA_LISR_FEIF0 (1 << 0)
+#define DMA_LISR_DMEIF0 (1 << 2)
+#define DMA_LISR_TEIF0 (1 << 3)
+#define DMA_LISR_HTIF0 (1 << 4)
+#define DMA_LISR_TCIF0 (1 << 5)
+
+#define DMA_LISR_FEIF1 (1 << 6)
+#define DMA_LISR_DMEIF1 (1 << 8)
+#define DMA_LISR_TEIF1 (1 << 9)
+#define DMA_LISR_HTIF1 (1 << 10)
+#define DMA_LISR_TCIF1 (1 << 11)
+
+#define DMA_LISR_FEIF2 (1 << 16)
+#define DMA_LISR_DMEIF2 (1 << 18)
+#define DMA_LISR_TEIF2 (1 << 19)
+#define DMA_LISR_HTIF2 (1 << 20)
+#define DMA_LISR_TCIF2 (1 << 21)
+
+#define DMA_LISR_FEIF3 (1 << 22)
+#define DMA_LISR_DMEIF3 (1 << 24)
+#define DMA_LISR_TEIF3 (1 << 25)
+#define DMA_LISR_HTIF3 (1 << 26)
+#define DMA_LISR_TCIF3 (1 << 27)
+
+/* --- DMA_HISR values ----------------------------------------------------- */
+
+#define DMA_HISR_FEIF4 (1 << 0)
+#define DMA_HISR_DMEIF4 (1 << 2)
+#define DMA_HISR_TEIF4 (1 << 3)
+#define DMA_HISR_HTIF4 (1 << 4)
+#define DMA_HISR_TCIF4 (1 << 5)
+
+#define DMA_HISR_FEIF5 (1 << 6)
+#define DMA_HISR_DMEIF5 (1 << 8)
+#define DMA_HISR_TEIF5 (1 << 9)
+#define DMA_HISR_HTIF5 (1 << 10)
+#define DMA_HISR_TCIF5 (1 << 11)
+
+#define DMA_HISR_FEIF6 (1 << 16)
+#define DMA_HISR_DMEIF6 (1 << 18)
+#define DMA_HISR_TEIF6 (1 << 19)
+#define DMA_HISR_HTIF6 (1 << 20)
+#define DMA_HISR_TCIF6 (1 << 21)
+
+#define DMA_HISR_FEIF7 (1 << 22)
+#define DMA_HISR_DMEIF7 (1 << 24)
+#define DMA_HISR_TEIF7 (1 << 25)
+#define DMA_HISR_HTIF7 (1 << 26)
+#define DMA_HISR_TCIF7 (1 << 27)
+
+/* --- DMA_LIFCR values ----------------------------------------------------- */
+
+#define DMA_LIFCR_CFEIF0 (1 << 0)
+#define DMA_LIFCR_CDMEIF0 (1 << 2)
+#define DMA_LIFCR_CTEIF0 (1 << 3)
+#define DMA_LIFCR_CHTIF0 (1 << 4)
+#define DMA_LIFCR_CTCIF0 (1 << 5)
+
+#define DMA_LIFCR_CFEIF1 (1 << 6)
+#define DMA_LIFCR_CDMEIF1 (1 << 8)
+#define DMA_LIFCR_CTEIF1 (1 << 9)
+#define DMA_LIFCR_CHTIF1 (1 << 10)
+#define DMA_LIFCR_CTCIF1 (1 << 11)
+
+#define DMA_LIFCR_CFEIF2 (1 << 16)
+#define DMA_LIFCR_CDMEIF2 (1 << 18)
+#define DMA_LIFCR_CTEIF2 (1 << 19)
+#define DMA_LIFCR_CHTIF2 (1 << 20)
+#define DMA_LIFCR_CTCIF2 (1 << 21)
+
+#define DMA_LIFCR_CFEIF3 (1 << 22)
+#define DMA_LIFCR_CDMEIF3 (1 << 24)
+#define DMA_LIFCR_CTEIF3 (1 << 25)
+#define DMA_LIFCR_CHTIF3 (1 << 26)
+#define DMA_LIFCR_CTCIF3 (1 << 27)
+
+/* --- DMA_HIFCR values ----------------------------------------------------- */
+
+#define DMA_HIFCR_CFEIF4 (1 << 0)
+#define DMA_HIFCR_CDMEIF4 (1 << 2)
+#define DMA_HIFCR_CTEIF4 (1 << 3)
+#define DMA_HIFCR_CHTIF4 (1 << 4)
+#define DMA_HIFCR_CTCIF4 (1 << 5)
+
+#define DMA_HIFCR_CFEIF5 (1 << 6)
+#define DMA_HIFCR_CDMEIF5 (1 << 8)
+#define DMA_HIFCR_CTEIF5 (1 << 9)
+#define DMA_HIFCR_CHTIF5 (1 << 10)
+#define DMA_HIFCR_CTCIF5 (1 << 11)
+
+#define DMA_HIFCR_CFEIF6 (1 << 16)
+#define DMA_HIFCR_CDMEIF6 (1 << 18)
+#define DMA_HIFCR_CTEIF6 (1 << 19)
+#define DMA_HIFCR_CHTIF6 (1 << 20)
+#define DMA_HIFCR_CTCIF6 (1 << 21)
+
+#define DMA_HIFCR_CFEIF7 (1 << 22)
+#define DMA_HIFCR_CDMEIF7 (1 << 24)
+#define DMA_HIFCR_CTEIF7 (1 << 25)
+#define DMA_HIFCR_CHTIF7 (1 << 26)
+#define DMA_HIFCR_CTCIF7 (1 << 27)
+
+/* --- DMA_SxCR values ----------------------------------------------------- */
+
+/* EN: Stream enable */
+#define DMA_SxCR_EN (1 << 0)
+/* DMEIE: Direct Mode error interrupt enable */
+#define DMA_SxCR_DMEIE (1 << 1)
+/* TEIE: Transfer error interrupt enable */
+#define DMA_SxCR_TEIE (1 << 2)
+/* HTIE: Half transfer interrupt enable */
+#define DMA_SxCR_HTIE (1 << 3)
+/* TCIE: Transfer complete interrupt enable */
+#define DMA_SxCR_TCIE (1 << 4)
+/* PFCTRL: Peripheral Flow Controller */
+#define DMA_SxCR_PFCTRL (1 << 5)
+
+/* DIR[7:6]: Data transfer direction */
+/** @defgroup dma_st_dir DMA Stream Data transfer direction
+@ingroup dma_defines
+
+@{*/
+#define DMA_SxCR_DIR_PERIPHERAL_TO_MEM (0 << 6)
+#define DMA_SxCR_DIR_MEM_TO_PERIPHERAL (1 << 6)
+#define DMA_SxCR_DIR_MEM_TO_MEM (2 << 6)
+/**@}*/
+#define DMA_SxCR_DIR_SHIFT 6
+#define DMA_SxCR_DIR_MASK (3 << 6)
+
+/* CIRC: Circular mode */
+#define DMA_SxCR_CIRC (1 << 8)
+/* PINC: Peripheral increment mode */
+#define DMA_SxCR_PINC (1 << 9)
+/* MINC: Memory increment mode */
+#define DMA_SxCR_MINC (1 << 10)
+
+/* PSIZE[12:11]: Peripheral size */
+/** @defgroup dma_st_perwidth DMA Stream Peripheral Word Width
+@ingroup STM32F4xx_dma_defines
+
+@{*/
+#define DMA_SxCR_PSIZE_8BIT (0 << 11)
+#define DMA_SxCR_PSIZE_16BIT (1 << 11)
+#define DMA_SxCR_PSIZE_32BIT (2 << 11)
+/**@}*/
+#define DMA_SxCR_PSIZE_SHIFT 11
+#define DMA_SxCR_PSIZE_MASK (3 << 11)
+
+/* MSIZE[14:13]: Memory size */
+/** @defgroup dma_st_memwidth DMA Stream Memory Word Width
+@ingroup STM32F4xx_dma_defines
+
+@{*/
+#define DMA_SxCR_MSIZE_8BIT (0 << 13)
+#define DMA_SxCR_MSIZE_16BIT (1 << 13)
+#define DMA_SxCR_MSIZE_32BIT (2 << 13)
+/**@}*/
+#define DMA_SxCR_MSIZE_SHIFT 13
+#define DMA_SxCR_MSIZE_MASK (3 << 13)
+
+/* PINCOS: Peripheral increment offset size */
+#define DMA_SxCR_PINCOS (1 << 15)
+
+/* PL[17:16]: Stream priority level */
+/** @defgroup dma_st_pri DMA Stream Priority Levels
+@ingroup dma_defines
+
+@{*/
+#define DMA_SxCR_PL_LOW (0 << 16)
+#define DMA_SxCR_PL_MEDIUM (1 << 16)
+#define DMA_SxCR_PL_HIGH (2 << 16)
+#define DMA_SxCR_PL_VERY_HIGH (3 << 16)
+/**@}*/
+#define DMA_SxCR_PL_SHIFT 16
+#define DMA_SxCR_PL_MASK (3 << 16)
+
+/* DBM: Double buffered mode */
+#define DMA_SxCR_DBM (1 << 18)
+/* CT: Current target (in double buffered mode) */
+#define DMA_SxCR_CT (1 << 19)
+
+/* Bit 20 reserved */
+
+/* PBURST[13:12]: Peripheral Burst Configuration */
+/** @defgroup dma_pburst DMA Peripheral Burst Length
+@ingroup dma_defines
+
+@{*/
+#define DMA_SxCR_PBURST_SINGLE (0 << 21)
+#define DMA_SxCR_PBURST_INCR4 (1 << 21)
+#define DMA_SxCR_PBURST_INCR8 (2 << 21)
+#define DMA_SxCR_PBURST_INCR16 (3 << 21)
+/**@}*/
+#define DMA_SxCR_PBURST_SHIFT 21
+#define DMA_SxCR_PBURST_MASK (3 << 21)
+
+/* MBURST[13:12]: Memory Burst Configuration */
+/** @defgroup dma_mburst DMA Memory Burst Length
+@ingroup STM32F4xx_dma_defines
+
+@{*/
+#define DMA_SxCR_MBURST_SINGLE (0 << 23)
+#define DMA_SxCR_MBURST_INCR4 (1 << 23)
+#define DMA_SxCR_MBURST_INCR8 (2 << 23)
+#define DMA_SxCR_MBURST_INCR16 (3 << 23)
+/**@}*/
+#define DMA_SxCR_MBURST_SHIFT 23
+#define DMA_SxCR_MBURST_MASK (3 << 23)
+
+/* CHSEL[25:27]: Channel Select */
+/** @defgroup dma_ch_sel DMA Channel Select
+@ingroup dma_defines
+
+@{*/
+#define DMA_SxCR_CHSEL_0 (0 << DMA_SxCR_CHSEL_SHIFT)
+#define DMA_SxCR_CHSEL_1 (1 << DMA_SxCR_CHSEL_SHIFT)
+#define DMA_SxCR_CHSEL_2 (2 << DMA_SxCR_CHSEL_SHIFT)
+#define DMA_SxCR_CHSEL_3 (3 << DMA_SxCR_CHSEL_SHIFT)
+#define DMA_SxCR_CHSEL_4 (4 << DMA_SxCR_CHSEL_SHIFT)
+#define DMA_SxCR_CHSEL_5 (5 << DMA_SxCR_CHSEL_SHIFT)
+#define DMA_SxCR_CHSEL_6 (6 << DMA_SxCR_CHSEL_SHIFT)
+#define DMA_SxCR_CHSEL_7 (7 << DMA_SxCR_CHSEL_SHIFT)
+/**@}*/
+#define DMA_SxCR_CHSEL_SHIFT 25
+#define DMA_SxCR_CHSEL_MASK (7 << 25)
+#define DMA_SxCR_CHSEL(n) (n << DMA_SxCR_CHSEL_SHIFT)
+
+/* Reserved [31:28] */
+
+/* --- DMA_SxNDTR values --------------------------------------------------- */
+
+/* DMA_SxNDTR[15:0]: Number of data register. */
+
+/* --- DMA_SxPAR values ---------------------------------------------------- */
+
+/* DMA_SxPAR[31:0]: Peripheral address register. */
+
+/* --- DMA_SxM0AR values --------------------------------------------------- */
+
+/* DMA_SxM0AR[31:0]: Memory 0 address register. */
+
+/* --- DMA_SxM1AR values --------------------------------------------------- */
+
+/* DMA_SxM1AR[31:0]: Memory 1 address register. */
+
+/* --- DMA_SxFCR values ---------------------------------------------------- */
+
+/* FTH[1:0]: FIFO Threshold selection */
+/** @defgroup dma_fifo_thresh FIFO Threshold selection
+@ingroup STM32F4xx_dma_defines
+
+@{*/
+#define DMA_SxFCR_FTH_1_4_FULL (0 << 0)
+#define DMA_SxFCR_FTH_2_4_FULL (1 << 0)
+#define DMA_SxFCR_FTH_3_4_FULL (2 << 0)
+#define DMA_SxFCR_FTH_4_4_FULL (3 << 0)
+/**@}*/
+#define DMA_SxFCR_FTH_SHIFT 0
+#define DMA_SxFCR_FTH_MASK (3 << 0)
+
+/* DMDIS: Direct Mode disable */
+#define DMA_SxFCR_DMDIS (1 << 2)
+
+/* FS[5:3]: FIFO Status */
+/** @defgroup dma_fifo_status FIFO Status
+@ingroup STM32F4xx_dma_defines
+
+@{*/
+#define DMA_SxFCR_FS_LT_1_4_FULL (0 << 0)
+#define DMA_SxFCR_FS_LT_2_4_FULL (1 << 0)
+#define DMA_SxFCR_FS_LT_3_4_FULL (2 << 0)
+#define DMA_SxFCR_FS_LT_4_4_FULL (3 << 0)
+#define DMA_SxFCR_FS_FULL (4 << 3)
+#define DMA_SxFCR_FS_EMPTY (5 << 3)
+/**@}*/
+#define DMA_SxFCR_FS_SHIFT 3
+#define DMA_SxFCR_FS_MASK (7 << 3)
+
+/* [6]: reserved */
+
+/* FEIE[7]: FIFO error interrupt enable */
+#define DMA_SxFCR_FEIE (1 << 7)
+
+/* [31:8]: Reserved */
+
+/* --- Function prototypes ------------------------------------------------- */
+
+BEGIN_DECLS
+
+/*
+ * Note: The F2 and F4 series have a completely new DMA peripheral with different
+ * configuration options.
+ */
+
+void dma_stream_reset(u32 dma, u8 stream);
+void dma_clear_interrupt_flags(u32 dma, u8 stream, u32 interrupts);
+bool dma_get_interrupt_flag(u32 dma, u8 stream, u32 interrupt);
+void dma_set_transfer_mode(u32 dma, u8 stream, u32 direction);
+void dma_set_priority(u32 dma, u8 stream, u32 prio);
+void dma_set_memory_size(u32 dma, u8 stream, u32 mem_size);
+void dma_set_peripheral_size(u32 dma, u8 stream, u32 peripheral_size);
+void dma_enable_memory_increment_mode(u32 dma, u8 stream);
+void dma_disable_memory_increment_mode(u32 dma, u8 channel);
+void dma_enable_peripheral_increment_mode(u32 dma, u8 stream);
+void dma_disable_peripheral_increment_mode(u32 dma, u8 channel);
+void dma_enable_fixed_peripheral_increment_mode(u32 dma, u8 stream);
+void dma_enable_circular_mode(u32 dma, u8 stream);
+void dma_channel_select(u32 dma, u8 stream, u32 channel);
+void dma_channel_select(u32 dma, u8 stream, u32 channel);
+void dma_set_memory_burst(u32 dma, u8 stream, u32 burst);
+void dma_set_peripheral_burst(u32 dma, u8 stream, u32 burst);
+void dma_set_initial_target(u32 dma, u8 stream, u8 memory);
+u8 dma_get_target(u32 dma, u8 stream);
+void dma_enable_double_buffer_mode(u32 dma, u8 stream);
+void dma_disable_double_buffer_mode(u32 dma, u8 stream);
+void dma_set_peripheral_flow_control(u32 dma, u8 stream);
+void dma_set_dma_flow_control(u32 dma, u8 stream);
+void dma_enable_transfer_error_interrupt(u32 dma, u8 stream);
+void dma_disable_transfer_error_interrupt(u32 dma, u8 stream);
+void dma_enable_half_transfer_interrupt(u32 dma, u8 stream);
+void dma_disable_half_transfer_interrupt(u32 dma, u8 stream);
+void dma_enable_transfer_complete_interrupt(u32 dma, u8 stream);
+void dma_disable_transfer_complete_interrupt(u32 dma, u8 stream);
+u32 dma_fifo_status(u32 dma, u8 stream);
+void dma_enable_direct_mode_error_interrupt(u32 dma, u8 stream);
+void dma_disable_direct_mode_error_interrupt(u32 dma, u8 stream);
+void dma_enable_fifo_error_interrupt(u32 dma, u8 stream);
+void dma_disable_fifo_error_interrupt(u32 dma, u8 stream);
+void dma_enable_direct_mode(u32 dma, u8 stream);
+void dma_enable_fifo_mode(u32 dma, u8 stream);
+void dma_set_fifo_threshold(u32 dma, u8 stream, u32 threshold);
+void dma_enable_stream(u32 dma, u8 stream);
+void dma_disable_stream(u32 dma, u8 stream);
+void dma_set_peripheral_address(u32 dma, u8 stream, u32 address);
+void dma_set_memory_address(u32 dma, u8 stream, u32 address);
+void dma_set_memory_address_1(u32 dma, u8 stream, u32 address);
+void dma_set_number_of_data(u32 dma, u8 stream, u16 number);
+
+END_DECLS
+/**@}*/
+#endif
+
diff --git a/include/libopencm3/stm32/dma.h b/include/libopencm3/stm32/dma.h
new file mode 100644
index 0000000..3d553e5
--- /dev/null
+++ b/include/libopencm3/stm32/dma.h
@@ -0,0 +1,31 @@
+/* This provides unification of code over STM32F subfamilies */
+
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if defined(STM32F1)
+# include <libopencm3/stm32/f1/dma.h>
+#elif defined(STM32F2)
+# include <libopencm3/stm32/f2/dma.h>
+#elif defined(STM32F4)
+# include <libopencm3/stm32/f4/dma.h>
+/*#elif defined(STM32L1)
+# include <libopencm3/stm32/l1/dma.h>*/
+#else
+# error "stm32 family not defined."
+#endif
+
diff --git a/include/libopencm3/stm32/f2/dma.h b/include/libopencm3/stm32/f2/dma.h
index 545df6f..8226f55 100644
--- a/include/libopencm3/stm32/f2/dma.h
+++ b/include/libopencm3/stm32/f2/dma.h
@@ -1,8 +1,22 @@
+/** @defgroup STM32F2xx_dma_defines DMA Defines
+
+@ingroup STM32F2xx_defines
+
+@brief Defined Constants and Types for the STM32F2xx DMA Controller
+
+@version 1.0.0
+
+@author @htmlonly &copy; @endhtmlonly 2011 Fergus Noble <fergusnoble@gmail.com>
+@author @htmlonly &copy; @endhtmlonly 2012 Ken Sarkies <ksarkies@internode.on.net>
+
+@date 18 October 2012
+
+LGPL License Terms @ref lgpl_license
+ */
+
/*
* This file is part of the libopencm3 project.
*
- * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
- *
* This library is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -20,392 +34,8 @@
#ifndef LIBOPENCM3_DMA_H
#define LIBOPENCM3_DMA_H
-#include <libopencm3/stm32/memorymap.h>
-#include <libopencm3/cm3/common.h>
-
-/* --- Convenience macros -------------------------------------------------- */
-
-/* DMA controller base addresses (for convenience) */
-#define DMA1 DMA1_BASE
-#define DMA2 DMA2_BASE
-
-/* DMA stream base addresses (for convenience) */
-#define DMA_STREAM(port, n) ((port) + 0x10 + (24 * (n)))
-#define DMA1_STREAM(n) DMA_STREAM(DMA1, n)
-#define DMA2_STREAM(n) DMA_STREAM(DMA2, n)
-
-#define DMA1_STREAM0 DMA1_STREAM(0)
-#define DMA1_STREAM1 DMA1_STREAM(1)
-#define DMA1_STREAM2 DMA1_STREAM(2)
-#define DMA1_STREAM3 DMA1_STREAM(3)
-#define DMA1_STREAM4 DMA1_STREAM(4)
-#define DMA1_STREAM5 DMA1_STREAM(5)
-#define DMA1_STREAM6 DMA1_STREAM(6)
-#define DMA1_STREAM7 DMA1_STREAM(7)
-
-#define DMA2_STREAM0 DMA2_STREAM(0)
-#define DMA2_STREAM1 DMA2_STREAM(1)
-#define DMA2_STREAM2 DMA2_STREAM(2)
-#define DMA2_STREAM3 DMA2_STREAM(3)
-#define DMA2_STREAM4 DMA2_STREAM(4)
-#define DMA2_STREAM5 DMA2_STREAM(5)
-#define DMA2_STREAM6 DMA2_STREAM(6)
-#define DMA2_STREAM7 DMA2_STREAM(7)
-
-/* --- DMA controller registers -------------------------------------------- */
-
-/* DMA low interrupt status register (DMAx_LISR) */
-#define DMA_LISR(port) MMIO32(port + 0x00)
-#define DMA1_LISR DMA_LISR(DMA1)
-#define DMA2_LISR DMA_LISR(DMA2)
-
-/* DMA high interrupt status register (DMAx_HISR) */
-#define DMA_HISR(port) MMIO32(port + 0x04)
-#define DMA1_HISR DMA_HISR(DMA1)
-#define DMA2_HISR DMA_HISR(DMA2)
-
-/* DMA low interrupt flag clear register (DMAx_LIFCR) */
-#define DMA_LIFCR(port) MMIO32(port + 0x08)
-#define DMA1_LIFCR DMA_LIFCR(DMA1)
-#define DMA2_LIFCR DMA_LIFCR(DMA2)
-
-/* DMA high interrupt flag clear register (DMAx_HIFCR) */
-#define DMA_HIFCR(port) MMIO32(port + 0x0C)
-#define DMA1_HIFCR DMA_HIFCR(DMA1)
-#define DMA2_HIFCR DMA_HIFCR(DMA2)
-
-/* --- DMA stream registers ------------------------------------------------ */
-
-/* DMA Stream x configuration register (DMA_SxCR) */
-#define DMA_SCR(port, n) MMIO32(DMA_STREAM(port, n) + 0x00)
-#define DMA1_SCR(n) DMA_SCR(DMA1, n)
-#define DMA2_SCR(n) DMA_SCR(DMA2, n)
-
-#define DMA1_S0CR DMA1_SCR(0)
-#define DMA1_S1CR DMA1_SCR(1)
-#define DMA1_S2CR DMA1_SCR(2)
-#define DMA1_S3CR DMA1_SCR(3)
-#define DMA1_S4CR DMA1_SCR(4)
-#define DMA1_S5CR DMA1_SCR(5)
-#define DMA1_S6CR DMA1_SCR(6)
-#define DMA1_S7CR DMA1_SCR(7)
-
-#define DMA2_S0CR DMA2_SCR(0)
-#define DMA2_S1CR DMA2_SCR(1)
-#define DMA2_S2CR DMA2_SCR(2)
-#define DMA2_S3CR DMA2_SCR(3)
-#define DMA2_S4CR DMA2_SCR(4)
-#define DMA2_S5CR DMA2_SCR(5)
-#define DMA2_S6CR DMA2_SCR(6)
-#define DMA2_S7CR DMA2_SCR(7)
-
-/* DMA Stream x number of data register (DMA_SxNDTR) */
-#define DMA_SNDTR(port, n) MMIO32(DMA_STREAM(port, n) + 0x04)
-#define DMA1_SNDTR(n) DMA_SNDTR(DMA1, n)
-#define DMA2_SNDTR(n) DMA_SNDTR(DMA2, n)
-
-#define DMA1_S0NDTR DMA1_SNDTR(0)
-#define DMA1_S1NDTR DMA1_SNDTR(1)
-#define DMA1_S2NDTR DMA1_SNDTR(2)
-#define DMA1_S3NDTR DMA1_SNDTR(3)
-#define DMA1_S4NDTR DMA1_SNDTR(4)
-#define DMA1_S5NDTR DMA1_SNDTR(5)
-#define DMA1_S6NDTR DMA1_SNDTR(6)
-#define DMA1_S7NDTR DMA1_SNDTR(7)
-
-#define DMA2_S0NDTR DMA2_SNDTR(0)
-#define DMA2_S1NDTR DMA2_SNDTR(1)
-#define DMA2_S2NDTR DMA2_SNDTR(2)
-#define DMA2_S3NDTR DMA2_SNDTR(3)
-#define DMA2_S4NDTR DMA2_SNDTR(4)
-#define DMA2_S5NDTR DMA2_SNDTR(5)
-#define DMA2_S6NDTR DMA2_SNDTR(6)
-#define DMA2_S7NDTR DMA2_SNDTR(7)
-
-/* DMA Stream x peripheral address register (DMA_SxPAR) */
-#define DMA_SPAR(port, n) *(volatile void **)(DMA_STREAM(port, n) + 0x08)
-#define DMA1_SPAR(n) DMA_SPAR(DMA1, n)
-#define DMA2_SPAR(n) DMA_SPAR(DMA2, n)
-
-#define DMA1_S0PAR DMA1_SPAR(0)
-#define DMA1_S1PAR DMA1_SPAR(1)
-#define DMA1_S2PAR DMA1_SPAR(2)
-#define DMA1_S3PAR DMA1_SPAR(3)
-#define DMA1_S4PAR DMA1_SPAR(4)
-#define DMA1_S5PAR DMA1_SPAR(5)
-#define DMA1_S6PAR DMA1_SPAR(6)
-#define DMA1_S7PAR DMA1_SPAR(7)
-
-#define DMA2_S0PAR DMA2_SPAR(0)
-#define DMA2_S1PAR DMA2_SPAR(1)
-#define DMA2_S2PAR DMA2_SPAR(2)
-#define DMA2_S3PAR DMA2_SPAR(3)
-#define DMA2_S4PAR DMA2_SPAR(4)
-#define DMA2_S5PAR DMA2_SPAR(5)
-#define DMA2_S6PAR DMA2_SPAR(6)
-#define DMA2_S7PAR DMA2_SPAR(7)
-
-/* DMA Stream x memory address 0 register (DMA_SxM0AR) */
-#define DMA_SM0AR(port, n) *(volatile void **)(DMA_STREAM(port, n) + 0x0c)
-#define DMA1_SM0AR(n) DMA_SM0AR(DMA1, n)
-#define DMA2_SM0AR(n) DMA_SM0AR(DMA2, n)
-
-#define DMA1_S0M0AR DMA1_SM0AR(0)
-#define DMA1_S1M0AR DMA1_SM0AR(1)
-#define DMA1_S2M0AR DMA1_SM0AR(2)
-#define DMA1_S3M0AR DMA1_SM0AR(3)
-#define DMA1_S4M0AR DMA1_SM0AR(4)
-#define DMA1_S5M0AR DMA1_SM0AR(5)
-#define DMA1_S6M0AR DMA1_SM0AR(6)
-#define DMA1_S7M0AR DMA1_SM0AR(7)
-
-#define DMA2_S0M0AR DMA2_SM0AR(0)
-#define DMA2_S1M0AR DMA2_SM0AR(1)
-#define DMA2_S2M0AR DMA2_SM0AR(2)
-#define DMA2_S3M0AR DMA2_SM0AR(3)
-#define DMA2_S4M0AR DMA2_SM0AR(4)
-#define DMA2_S5M0AR DMA2_SM0AR(5)
-#define DMA2_S6M0AR DMA2_SM0AR(6)
-#define DMA2_S7M0AR DMA2_SM0AR(7)
-
-/* DMA Stream x memory address 1 register (DMA_SxM1AR) */
-#define DMA_SM1AR(port, n) *(volatile void **)(DMA_STREAM(port, n) + 0x10)
-#define DMA1_SM1AR(n) DMA_SM1AR(DMA1, n)
-#define DMA2_SM1AR(n) DMA_SM1AR(DMA2, n)
-
-#define DMA1_S0M1AR DMA1_SM1AR(0)
-#define DMA1_S1M1AR DMA1_SM1AR(1)
-#define DMA1_S2M1AR DMA1_SM1AR(2)
-#define DMA1_S3M1AR DMA1_SM1AR(3)
-#define DMA1_S4M1AR DMA1_SM1AR(4)
-#define DMA1_S5M1AR DMA1_SM1AR(5)
-#define DMA1_S6M1AR DMA1_SM1AR(6)
-#define DMA1_S7M1AR DMA1_SM1AR(7)
-
-#define DMA2_S0M1AR DMA2_SM1AR(0)
-#define DMA2_S1M1AR DMA2_SM1AR(1)
-#define DMA2_S2M1AR DMA2_SM1AR(2)
-#define DMA2_S3M1AR DMA2_SM1AR(3)
-#define DMA2_S4M1AR DMA2_SM1AR(4)
-#define DMA2_S5M1AR DMA2_SM1AR(5)
-#define DMA2_S6M1AR DMA2_SM1AR(6)
-#define DMA2_S7M1AR DMA2_SM1AR(7)
-
-/* DMA Stream x FIFO control register (DMA_SxFCR) */
-#define DMA_SFCR(port, n) MMIO32(DMA_STREAM(port, n) + 0x10)
-#define DMA1_SFCR(n) DMA_SFCR(DMA1, n)
-#define DMA2_SFCR(n) DMA_SFCR(DMA2, n)
-
-#define DMA1_S0FCR DMA1_SFCR(0)
-#define DMA1_S1FCR DMA1_SFCR(1)
-#define DMA1_S2FCR DMA1_SFCR(2)
-#define DMA1_S3FCR DMA1_SFCR(3)
-#define DMA1_S4FCR DMA1_SFCR(4)
-#define DMA1_S5FCR DMA1_SFCR(5)
-#define DMA1_S6FCR DMA1_SFCR(6)
-#define DMA1_S7FCR DMA1_SFCR(7)
-
-#define DMA2_S0FCR DMA2_SFCR(0)
-#define DMA2_S1FCR DMA2_SFCR(1)
-#define DMA2_S2FCR DMA2_SFCR(2)
-#define DMA2_S3FCR DMA2_SFCR(3)
-#define DMA2_S4FCR DMA2_SFCR(4)
-#define DMA2_S5FCR DMA2_SFCR(5)
-#define DMA2_S6FCR DMA2_SFCR(6)
-#define DMA2_S7FCR DMA2_SFCR(7)
-
-/* --- DMA_LISR values ----------------------------------------------------- */
-
-#define DMA_LISR_FEIF0 (1 << 0)
-#define DMA_LISR_DMEIF0 (1 << 2)
-#define DMA_LISR_TEIF0 (1 << 3)
-#define DMA_LISR_HTIF0 (1 << 4)
-#define DMA_LISR_TCIF0 (1 << 5)
-
-#define DMA_LISR_FEIF1 (1 << 6)
-#define DMA_LISR_DMEIF1 (1 << 8)
-#define DMA_LISR_TEIF1 (1 << 9)
-#define DMA_LISR_HTIF1 (1 << 10)
-#define DMA_LISR_TCIF1 (1 << 11)
-
-#define DMA_LISR_FEIF2 (1 << 16)
-#define DMA_LISR_DMEIF2 (1 << 18)
-#define DMA_LISR_TEIF2 (1 << 19)
-#define DMA_LISR_HTIF2 (1 << 20)
-#define DMA_LISR_TCIF2 (1 << 21)
-
-#define DMA_LISR_FEIF3 (1 << 22)
-#define DMA_LISR_DMEIF3 (1 << 24)
-#define DMA_LISR_TEIF3 (1 << 25)
-#define DMA_LISR_HTIF3 (1 << 26)
-#define DMA_LISR_TCIF3 (1 << 27)
-
-/* --- DMA_HISR values ----------------------------------------------------- */
-
-#define DMA_HISR_FEIF4 (1 << 0)
-#define DMA_HISR_DMEIF4 (1 << 2)
-#define DMA_HISR_TEIF4 (1 << 3)
-#define DMA_HISR_HTIF4 (1 << 4)
-#define DMA_HISR_TCIF4 (1 << 5)
-
-#define DMA_HISR_FEIF5 (1 << 6)
-#define DMA_HISR_DMEIF5 (1 << 8)
-#define DMA_HISR_TEIF5 (1 << 9)
-#define DMA_HISR_HTIF5 (1 << 10)
-#define DMA_HISR_TCIF5 (1 << 11)
-
-#define DMA_HISR_FEIF6 (1 << 16)
-#define DMA_HISR_DMEIF6 (1 << 18)
-#define DMA_HISR_TEIF6 (1 << 19)
-#define DMA_HISR_HTIF6 (1 << 20)
-#define DMA_HISR_TCIF6 (1 << 21)
-
-#define DMA_HISR_FEIF7 (1 << 22)
-#define DMA_HISR_DMEIF7 (1 << 24)
-#define DMA_HISR_TEIF7 (1 << 25)
-#define DMA_HISR_HTIF7 (1 << 26)
-#define DMA_HISR_TCIF7 (1 << 27)
-
-/* --- DMA_LIFCR values ----------------------------------------------------- */
-
-#define DMA_LIFCR_CFEIF0 (1 << 0)
-#define DMA_LIFCR_CDMEIF0 (1 << 2)
-#define DMA_LIFCR_CTEIF0 (1 << 3)
-#define DMA_LIFCR_CHTIF0 (1 << 4)
-#define DMA_LIFCR_CTCIF0 (1 << 5)
-
-#define DMA_LIFCR_CFEIF1 (1 << 6)
-#define DMA_LIFCR_CDMEIF1 (1 << 8)
-#define DMA_LIFCR_CTEIF1 (1 << 9)
-#define DMA_LIFCR_CHTIF1 (1 << 10)
-#define DMA_LIFCR_CTCIF1 (1 << 11)
-
-#define DMA_LIFCR_CFEIF2 (1 << 16)
-#define DMA_LIFCR_CDMEIF2 (1 << 18)
-#define DMA_LIFCR_CTEIF2 (1 << 19)
-#define DMA_LIFCR_CHTIF2 (1 << 20)
-#define DMA_LIFCR_CTCIF2 (1 << 21)
-
-#define DMA_LIFCR_CFEIF3 (1 << 22)
-#define DMA_LIFCR_CDMEIF3 (1 << 24)
-#define DMA_LIFCR_CTEIF3 (1 << 25)
-#define DMA_LIFCR_CHTIF3 (1 << 26)
-#define DMA_LIFCR_CTCIF3 (1 << 27)
-
-/* --- DMA_HIFCR values ----------------------------------------------------- */
-
-#define DMA_HIFCR_CFEIF4 (1 << 0)
-#define DMA_HIFCR_CDMEIF4 (1 << 2)
-#define DMA_HIFCR_CTEIF4 (1 << 3)
-#define DMA_HIFCR_CHTIF4 (1 << 4)
-#define DMA_HIFCR_CTCIF4 (1 << 5)
-
-#define DMA_HIFCR_CFEIF5 (1 << 6)
-#define DMA_HIFCR_CDMEIF5 (1 << 8)
-#define DMA_HIFCR_CTEIF5 (1 << 9)
-#define DMA_HIFCR_CHTIF5 (1 << 10)
-#define DMA_HIFCR_CTCIF5 (1 << 11)
-
-#define DMA_HIFCR_CFEIF6 (1 << 16)
-#define DMA_HIFCR_CDMEIF6 (1 << 18)
-#define DMA_HIFCR_CTEIF6 (1 << 19)
-#define DMA_HIFCR_CHTIF6 (1 << 20)
-#define DMA_HIFCR_CTCIF6 (1 << 21)
-
-#define DMA_HIFCR_CFEIF7 (1 << 22)
-#define DMA_HIFCR_CDMEIF7 (1 << 24)
-#define DMA_HIFCR_CTEIF7 (1 << 25)
-#define DMA_HIFCR_CHTIF7 (1 << 26)
-#define DMA_HIFCR_CTCIF7 (1 << 27)
-
-/* --- DMA_SxCR values ----------------------------------------------------- */
-
-#define DMA_SxCR_EN (1 << 0)
-#define DMA_SxCR_DMEIE (1 << 1)
-#define DMA_SxCR_TEIE (1 << 2)
-#define DMA_SxCR_HTIE (1 << 3)
-#define DMA_SxCR_TCIE (1 << 4)
-#define DMA_SxCR_PFCTRL (1 << 5)
-
-#define DMA_SxCR_DIR_SHIFT 6
-#define DMA_SxCR_DIR_PERIPHERAL_TO_MEM (0 << 6)
-#define DMA_SxCR_DIR_MEM_TO_PERIPHERAL (1 << 6)
-#define DMA_SxCR_DIR_MEM_TO_MEM (2 << 6)
-
-#define DMA_SxCR_CIRC (1 << 8)
-#define DMA_SxCR_PINC (1 << 9)
-#define DMA_SxCR_MINC (1 << 10)
-
-#define DMA_SxCR_PSIZE_SHIFT 11
-#define DMA_SxCR_PSIZE_8BIT (0 << 11)
-#define DMA_SxCR_PSIZE_16BIT (1 << 11)
-#define DMA_SxCR_PSIZE_32BIT (2 << 11)
-
-#define DMA_SxCR_MSIZE_SHIFT 13
-#define DMA_SxCR_MSIZE_8BIT (0 << 13)
-#define DMA_SxCR_MSIZE_16BIT (1 << 13)
-#define DMA_SxCR_MSIZE_32BIT (2 << 13)
-
-#define DMA_SxCR_PINCOS (1 << 15)
-
-#define DMA_SxCR_PL_SHIFT 16
-#define DMA_SxCR_PL_LOW (0 << 16)
-#define DMA_SxCR_PL_MEDIUM (1 << 16)
-#define DMA_SxCR_PL_HIGH (2 << 16)
-#define DMA_SxCR_PL_VERY_HIGH (3 << 16)
-
-#define DMA_SxCR_DBM (1 << 18)
-#define DMA_SxCR_CT (1 << 18)
-
-#define DMA_SxCR_PBURST_SHIFT 21
-#define DMA_SxCR_PBURST_SINGLE (0 << 21)
-#define DMA_SxCR_PBURST_INCR4 (1 << 21)
-#define DMA_SxCR_PBURST_INCR8 (2 << 21)
-#define DMA_SxCR_PBURST_INCR16 (3 << 21)
-
-#define DMA_SxCR_MBURST_SHIFT 23
-#define DMA_SxCR_MBURST_SINGLE (0 << 23)
-#define DMA_SxCR_MBURST_INCR4 (1 << 23)
-#define DMA_SxCR_MBURST_INCR8 (2 << 23)
-#define DMA_SxCR_MBURST_INCR16 (3 << 23)
-
-#define DMA_SxCR_CHSEL_SHIFT 25
-#define DMA_SxCR_CHSEL(n) (n << 25)
-
-/* --- DMA_SxNDTR values --------------------------------------------------- */
-
-/* DMA_SxNDTR[15:0]: Number of data register. */
-
-/* --- DMA_SxPAR values ---------------------------------------------------- */
-
-/* DMA_SxPAR[31:0]: Peripheral address register. */
-
-/* --- DMA_SxM0AR values --------------------------------------------------- */
-
-/* DMA_SxM0AR[31:0]: Memory 0 address register. */
-
-/* --- DMA_SxM1AR values --------------------------------------------------- */
-
-/* DMA_SxM1AR[31:0]: Memory 1 address register. */
-
-/* --- DMA_SxFCR values ---------------------------------------------------- */
-
-#define DMA_SxFCR_FTH_SHIFT 0
-#define DMA_SxFCR_FTH_1_4_FULL (0 << 0)
-#define DMA_SxFCR_FTH_2_4_FULL (1 << 0)
-#define DMA_SxFCR_FTH_3_4_FULL (2 << 0)
-#define DMA_SxFCR_FTH_4_4_FULL (3 << 0)
-
-#define DMA_SxFCR_DMDIS (1 << 2)
-
-#define DMA_SxFCR_FS_SHIFT 3
-#define DMA_SxFCR_FS_LT_1_4_FULL (0 << 0)
-#define DMA_SxFCR_FS_LT_2_4_FULL (1 << 0)
-#define DMA_SxFCR_FS_LT_3_4_FULL (2 << 0)
-#define DMA_SxFCR_FS_LT_4_4_FULL (3 << 0)
-#define DMA_SxFCR_FS_FULL (4 << 3)
-#define DMA_SxFCR_FS_EMPTY (5 << 3)
-
-#define DMA_SxFCR_FEIE (1 << 7)
+#include <libopencm3/stm32/f2/memorymap.h>
+#include <libopencm3/stm32/common/dma_common_f24.h>
#endif
+
diff --git a/include/libopencm3/stm32/f4/dma.h b/include/libopencm3/stm32/f4/dma.h
index c765a79..cc97024 100644
--- a/include/libopencm3/stm32/f4/dma.h
+++ b/include/libopencm3/stm32/f4/dma.h
@@ -6,17 +6,17 @@
@version 1.0.0
+@author @htmlonly &copy; @endhtmlonly 2011 Fergus Noble <fergusnoble@gmail.com>
@author @htmlonly &copy; @endhtmlonly 2012 Ken Sarkies <ksarkies@internode.on.net>
-@date 18 October 2012
+@date 30 November 2012
LGPL License Terms @ref lgpl_license
*/
+
/*
* This file is part of the libopencm3 project.
*
- * Copyright (C) 2012 Ken Sarkies <ksarkies@internode.on.net>
- *
* This library is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -31,663 +31,11 @@ LGPL License Terms @ref lgpl_license
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-/**@{*/
-
#ifndef LIBOPENCM3_DMA_H
#define LIBOPENCM3_DMA_H
-#include <libopencm3/stm32/memorymap.h>
-#include <libopencm3/cm3/common.h>
-
-/* --- Convenience macros -------------------------------------------------- */
-
-/* DMA register base adresses (for convenience) */
-#define DMA1 DMA1_BASE
-#define DMA2 DMA2_BASE
-
-/* --- DMA registers ------------------------------------------------------- */
-
-/* DMA low interrupt status register (DMAx_ISR) */
-#define DMA_LISR(dma_base) MMIO32(dma_base + 0x00)
-#define DMA1_LISR DMA_ISR(DMA1)
-#define DMA2_LISR DMA_ISR(DMA2)
-
-/* DMA high interrupt status register (DMAx_ISR) */
-#define DMA_HISR(dma_base) MMIO32(dma_base + 0x04)
-#define DMA1_HISR DMA_ISR(DMA1)
-#define DMA2_HISR DMA_ISR(DMA2)
-
-/* DMA low interrupt flag clear register (DMAx_IFCR) */
-#define DMA_LIFCR(dma_base) MMIO32(dma_base + 0x08)
-#define DMA1_LIFCR DMA_IFCR(DMA1)
-#define DMA2_LIFCR DMA_IFCR(DMA2)
-
-/* DMA high interrupt flag clear register (DMAx_IFCR) */
-#define DMA_HIFCR(dma_base) MMIO32(dma_base + 0x0C)
-#define DMA1_HIFCR DMA_IFCR(DMA1)
-#define DMA2_HIFCR DMA_IFCR(DMA2)
-
-/* DMA stream configuration register (DMAx_SyCR) */
-#define DMA_SCR(dma_base, stream) MMIO32(dma_base + 0x10 + \
- (0x18 * (stream)))
-
-#define DMA1_SCR(stream) DMA_SCR(DMA1, stream)
-#define DMA1_S0CR DMA1_SCR(DMA_STREAM0)
-#define DMA1_S1CR DMA1_SCR(DMA_STREAM1)
-#define DMA1_S2CR DMA1_SCR(DMA_STREAM2)
-#define DMA1_S3CR DMA1_SCR(DMA_STREAM3)
-#define DMA1_S4CR DMA1_SCR(DMA_STREAM4)
-#define DMA1_S5CR DMA1_SCR(DMA_STREAM5)
-#define DMA1_S6CR DMA1_SCR(DMA_STREAM6)
-#define DMA1_S7CR DMA1_SCR(DMA_STREAM7)
-
-#define DMA2_SCR(stream) DMA_SCR(DMA2, stream)
-#define DMA2_S0CR DMA2_SCR(DMA_STREAM0)
-#define DMA2_S1CR DMA2_SCR(DMA_STREAM1)
-#define DMA2_S2CR DMA2_SCR(DMA_STREAM2)
-#define DMA2_S3CR DMA2_SCR(DMA_STREAM3)
-#define DMA2_S4CR DMA2_SCR(DMA_STREAM4)
-#define DMA2_S5CR DMA2_SCR(DMA_STREAM5)
-#define DMA2_S6CR DMA2_SCR(DMA_STREAM6)
-#define DMA2_S7CR DMA2_SCR(DMA_STREAM7)
-
-/* DMA number of data register (DMAx_SyNDTR) */
-#define DMA_SNDTR(dma_base, stream) MMIO32(dma_base + 0x14 + \
- (0x18 * (stream)))
-
-#define DMA1_SNDTR(stream) DMA_SNDTR(DMA1, stream)
-#define DMA1_S0NDTR DMA1_SNDTR(DMA_STREAM0)
-#define DMA1_S1NDTR DMA1_SNDTR(DMA_STREAM1)
-#define DMA1_S2NDTR DMA1_SNDTR(DMA_STREAM2)
-#define DMA1_S3NDTR DMA1_SNDTR(DMA_STREAM3)
-#define DMA1_S4NDTR DMA1_SNDTR(DMA_STREAM4)
-#define DMA1_S5NDTR DMA1_SNDTR(DMA_STREAM5)
-#define DMA1_S6NDTR DMA1_SNDTR(DMA_STREAM6)
-#define DMA1_S7NDTR DMA1_SNDTR(DMA_STREAM7)
-
-#define DMA2_SNDTR(stream) DMA_CNDTR(DMA2, stream)
-#define DMA2_S0NDTR DMA2_SNDTR(DMA_STREAM0)
-#define DMA2_S1NDTR DMA2_SNDTR(DMA_STREAM1)
-#define DMA2_S2NDTR DMA2_SNDTR(DMA_STREAM2)
-#define DMA2_S3NDTR DMA2_SNDTR(DMA_STREAM3)
-#define DMA2_S4NDTR DMA2_SNDTR(DMA_STREAM4)
-#define DMA2_S5NDTR DMA2_SNDTR(DMA_STREAM5)
-#define DMA2_S6NDTR DMA2_SNDTR(DMA_STREAM6)
-#define DMA2_S7NDTR DMA2_SNDTR(DMA_STREAM7)
-
-/* DMA peripheral address register (DMAx_SyPAR) */
-#define DMA_SPAR(dma_base, stream) MMIO32(dma_base + 0x18 + \
- (0x18 * (stream)))
-
-#define DMA1_SPAR(stream) DMA_SPAR(DMA1, stream)
-#define DMA1_S0PAR DMA1_SPAR(DMA_STREAM0)
-#define DMA1_S1PAR DMA1_SPAR(DMA_STREAM1)
-#define DMA1_S2PAR DMA1_SPAR(DMA_STREAM2)
-#define DMA1_S3PAR DMA1_SPAR(DMA_STREAM3)
-#define DMA1_S4PAR DMA1_SPAR(DMA_STREAM4)
-#define DMA1_S5PAR DMA1_SPAR(DMA_STREAM5)
-#define DMA1_S6PAR DMA1_SPAR(DMA_STREAM6)
-#define DMA1_S7PAR DMA1_SPAR(DMA_STREAM7)
-
-#define DMA2_SPAR(stream) DMA_SPAR(DMA2, stream)
-#define DMA2_S0PAR DMA2_SPAR(DMA_STREAM0)
-#define DMA2_S1PAR DMA2_SPAR(DMA_STREAM1)
-#define DMA2_S2PAR DMA2_SPAR(DMA_STREAM2)
-#define DMA2_S3PAR DMA2_SPAR(DMA_STREAM3)
-#define DMA2_S4PAR DMA2_SPAR(DMA_STREAM4)
-#define DMA2_S5PAR DMA2_SPAR(DMA_STREAM5)
-#define DMA2_S6PAR DMA2_SPAR(DMA_STREAM6)
-#define DMA2_S7PAR DMA2_SPAR(DMA_STREAM7)
-
-/* DMA memory 0 address register (DMAx_SyM0AR) */
-
-#define DMA_SM0AR(dma_base, stream) MMIO32(dma_base + 0x1C + \
- (0x18 * (stream)))
-
-#define DMA1_SM0AR(stream) DMA_SM0AR(DMA1, stream)
-#define DMA1_S0M0AR DMA1_SM0AR(DMA_STREAM0)
-#define DMA1_S1M0AR DMA1_SM0AR(DMA_STREAM1)
-#define DMA1_S2M0AR DMA1_SM0AR(DMA_STREAM2)
-#define DMA1_S3M0AR DMA1_SM0AR(DMA_STREAM3)
-#define DMA1_S4M0AR DMA1_SM0AR(DMA_STREAM4)
-#define DMA1_S5M0AR DMA1_SM0AR(DMA_STREAM5)
-#define DMA1_S6M0AR DMA1_SM0AR(DMA_STREAM6)
-#define DMA1_S7M0AR DMA1_SM0AR(DMA_STREAM7)
-
-#define DMA2_SM0AR(stream) DMA_CM0AR(DMA2, stream)
-#define DMA2_S0M0AR DMA2_SM0AR(DMA_STREAM0)
-#define DMA2_S1M0AR DMA2_SM0AR(DMA_STREAM1)
-#define DMA2_S2M0AR DMA2_SM0AR(DMA_STREAM2)
-#define DMA2_S3M0AR DMA2_SM0AR(DMA_STREAM3)
-#define DMA2_S4M0AR DMA2_SM0AR(DMA_STREAM4)
-#define DMA2_S5M0AR DMA2_SM0AR(DMA_STREAM5)
-#define DMA2_S6M0AR DMA2_SM0AR(DMA_STREAM6)
-#define DMA2_S7M0AR DMA2_SM0AR(DMA_STREAM7)
-
-/* DMA memory 1 address register (DMAx_SyM1AR) */
-
-#define DMA_SM1AR(dma_base, stream) MMIO32(dma_base + 0x20 + \
- (0x18 * (stream)))
-
-#define DMA1_SM1AR(stream) DMA_SM1AR(DMA1, stream)
-#define DMA1_S0M1AR DMA1_SM1AR(DMA_STREAM0)
-#define DMA1_S1M1AR DMA1_SM1AR(DMA_STREAM1)
-#define DMA1_S2M1AR DMA1_SM1AR(DMA_STREAM2)
-#define DMA1_S3M1AR DMA1_SM1AR(DMA_STREAM3)
-#define DMA1_S4M1AR DMA1_SM1AR(DMA_STREAM4)
-#define DMA1_S5M1AR DMA1_SM1AR(DMA_STREAM5)
-#define DMA1_S6M1AR DMA1_SM1AR(DMA_STREAM6)
-#define DMA1_S7M1AR DMA1_SM1AR(DMA_STREAM7)
-
-#define DMA2_SM1AR(stream) DMA_CM1AR(DMA2, stream)
-#define DMA2_S0M1AR DMA2_SM1AR(DMA_STREAM0)
-#define DMA2_S1M1AR DMA2_SM1AR(DMA_STREAM1)
-#define DMA2_S2M1AR DMA2_SM1AR(DMA_STREAM2)
-#define DMA2_S3M1AR DMA2_SM1AR(DMA_STREAM3)
-#define DMA2_S4M1AR DMA2_SM1AR(DMA_STREAM4)
-#define DMA2_S5M1AR DMA2_SM1AR(DMA_STREAM5)
-#define DMA2_S6M1AR DMA2_SM1AR(DMA_STREAM6)
-#define DMA2_S7M1AR DMA2_SM1AR(DMA_STREAM7)
-
-/* DMA FIFO Control Register register (DMAx_SyFCR) */
-
-#define DMA_SFCR(dma_base, stream) MMIO32(dma_base + 0x24 + \
- (0x18 * (stream)))
-
-#define DMA1_SFCR(stream) DMA_SFCR(DMA1, stream)
-#define DMA1_S0FCR DMA1_SFCR(DMA_STREAM0)
-#define DMA1_S1FCR DMA1_SFCR(DMA_STREAM1)
-#define DMA1_S2FCR DMA1_SFCR(DMA_STREAM2)
-#define DMA1_S3FCR DMA1_SFCR(DMA_STREAM3)
-#define DMA1_S4FCR DMA1_SFCR(DMA_STREAM4)
-#define DMA1_S5FCR DMA1_SFCR(DMA_STREAM5)
-#define DMA1_S6FCR DMA1_SFCR(DMA_STREAM6)
-#define DMA1_S7FCR DMA1_SFCR(DMA_STREAM7)
-
-#define DMA2_SFCR(stream) DMA_CFCR(DMA2, stream)
-#define DMA2_S0FCR DMA2_SFCR(DMA_STREAM0)
-#define DMA2_S1FCR DMA2_SFCR(DMA_STREAM1)
-#define DMA2_S2FCR DMA2_SFCR(DMA_STREAM2)
-#define DMA2_S3FCR DMA2_SFCR(DMA_STREAM3)
-#define DMA2_S4FCR DMA2_SFCR(DMA_STREAM4)
-#define DMA2_S5FCR DMA2_SFCR(DMA_STREAM5)
-#define DMA2_S6FCR DMA2_SFCR(DMA_STREAM6)
-#define DMA2_S7FCR DMA2_SFCR(DMA_STREAM7)
-
-/* --- DMA Interrupt Flag offset values ------------------------------------- */
-/* These are based on every interrupt flag and flag clear being at the same relative location */
-/** @defgroup dma_if_offset DMA Interrupt Flag Offsets within stream flag group.
-@ingroup STM32F4xx_dma_defines
-
-@{*/
-/** Transfer Complete Interrupt Flag */
-#define DMA_ISR_TCIF (1 << 5)
-/** Half Transfer Interrupt Flag */
-#define DMA_ISR_HTIF (1 << 4)
-/** Transfer Error Interrupt Flag */
-#define DMA_ISR_TEIF (1 << 3)
-/** Direct Mode Error Interrupt Flag */
-#define DMA_ISR_DMEIF (1 << 2)
-/** FIFO Error Interrupt Flag */
-#define DMA_ISR_FEIF (1 << 0)
-/**@}*/
-
-/* Offset within interrupt status register to start of stream interrupt flag field */
-#define DMA_ISR_OFFSET(stream) (6*(stream & 0x01)+16*((stream & 0x02) >> 1))
-#define DMA_ISR_FLAGS (DMA_ISR_TCIF | DMA_ISR_HTIF | DMA_ISR_TEIF | DMA_ISR_DMEIF | DMA_ISR_FEIF)
-#define DMA_ISR_MASK(stream) DMA_ISR_FLAGS << DMA_ISR_OFFSET(stream)
-
-/* --- DMA_LISR values ------------------------------------------------------ */
-
-/* TCIF: Transfer complete interrupt flag, streams 0-3 only */
-#define DMA_LISR_TCIF_BIT DMA_ISR_TCIF
-#define DMA_LISR_TCIF(stream) (DMA_LISR_TCIF_BIT << DMA_ISR_OFFSET(stream))
-
-#define DMA_LISR_TCIF0 DMA_LISR_TCIF(DMA_STREAM0)
-#define DMA_LISR_TCIF1 DMA_LISR_TCIF(DMA_STREAM1)
-#define DMA_LISR_TCIF2 DMA_LISR_TCIF(DMA_STREAM2)
-#define DMA_LISR_TCIF3 DMA_LISR_TCIF(DMA_STREAM3)
-
-/* HTIF: Half transfer interrupt flag, streams 0-3 only */
-#define DMA_LISR_HTIF_BIT DMA_ISR_HTIF
-#define DMA_LISR_HTIF(stream) (DMA_LISR_HTIF_BIT << DMA_ISR_OFFSET(stream))
-
-#define DMA_LISR_HTIF0 DMA_LISR_HTIF(DMA_STREAM0)
-#define DMA_LISR_HTIF1 DMA_LISR_HTIF(DMA_STREAM1)
-#define DMA_LISR_HTIF2 DMA_LISR_HTIF(DMA_STREAM2)
-#define DMA_LISR_HTIF3 DMA_LISR_HTIF(DMA_STREAM3)
-
-/* TEIF: Transfer error interrupt flag, streams 0-3 only */
-#define DMA_LISR_TEIF_BIT DMA_ISR_TEIF
-#define DMA_LISR_TEIF(stream) (DMA_LISR_TEIF_BIT << DMA_ISR_OFFSET(stream))
-
-#define DMA_LISR_TEIF0 DMA_LISR_TEIF(DMA_STREAM0)
-#define DMA_LISR_TEIF1 DMA_LISR_TEIF(DMA_STREAM1)
-#define DMA_LISR_TEIF2 DMA_LISR_TEIF(DMA_STREAM2)
-#define DMA_LISR_TEIF3 DMA_LISR_TEIF(DMA_STREAM3)
-
-/* DMEIF: Direct Mode Error interrupt flag, streams 0-3 only */
-#define DMA_LISR_DMEIF_BIT DMA_ISR_DMEIF
-#define DMA_LISR_DMEIF(stream) (DMA_LISR_DMEIF_BIT << DMA_ISR_OFFSET(stream))
-
-#define DMA_LISR_DMEIF0 DMA_LISR_DMEIF(DMA_STREAM0)
-#define DMA_LISR_DMEIF1 DMA_LISR_DMEIF(DMA_STREAM1)
-#define DMA_LISR_DMEIF2 DMA_LISR_DMEIF(DMA_STREAM2)
-#define DMA_LISR_DMEIF3 DMA_LISR_DMEIF(DMA_STREAM3)
-
-/* Interrupt #1 is reserved */
-
-/* FEIF: FIFO Error interrupt flag, streams 0-3 only */
-#define DMA_LISR_FEIF_BIT DMA_ISR_FEIF
-#define DMA_LISR_FEIF(stream) (DMA_LISR_FEIF_BIT << DMA_ISR_OFFSET(stream))
-
-#define DMA_LISR_FEIF0 DMA_LISR_FEIF(DMA_STREAM0)
-#define DMA_LISR_FEIF1 DMA_LISR_FEIF(DMA_STREAM1)
-#define DMA_LISR_FEIF2 DMA_LISR_FEIF(DMA_STREAM2)
-#define DMA_LISR_FEIF3 DMA_LISR_FEIF(DMA_STREAM3)
-
-/* --- DMA_HISR values ------------------------------------------------------ */
-
-/* TCIF: Transfer complete interrupt flag, streams 4-7 only */
-#define DMA_HISR_TCIF_BIT DMA_ISR_TCIF
-#define DMA_HISR_TCIF(stream) (DMA_HISR_TCIF_BIT << (DMA_ISR_OFFSET(stream - 4))
-
-#define DMA_HISR_TCIF4 DMA_HISR_TCIF(DMA_STREAM4)
-#define DMA_HISR_TCIF5 DMA_HISR_TCIF(DMA_STREAM5)
-#define DMA_HISR_TCIF6 DMA_HISR_TCIF(DMA_STREAM6)
-#define DMA_HISR_TCIF7 DMA_HISR_TCIF(DMA_STREAM7)
-
-/* HTIF: Half transfer interrupt flag, streams 4-7 only */
-#define DMA_HISR_HTIF_BIT DMA_ISR_HTIF
-#define DMA_HISR_HTIF(stream) (DMA_HISR_HTIF_BIT << (DMA_ISR_OFFSET(stream - 4))
-
-#define DMA_HISR_HTIF4 DMA_HISR_HTIF(DMA_STREAM4)
-#define DMA_HISR_HTIF5 DMA_HISR_HTIF(DMA_STREAM5)
-#define DMA_HISR_HTIF6 DMA_HISR_HTIF(DMA_STREAM6)
-#define DMA_HISR_HTIF7 DMA_HISR_HTIF(DMA_STREAM7)
-
-/* TEIF: Transfer error interrupt flag, streams 4-7 only */
-#define DMA_HISR_TEIF_BIT DMA_ISR_TEIF
-#define DMA_HISR_TEIF(stream) (DMA_HISR_TEIF_BIT << (DMA_ISR_OFFSET(stream - 4))
-
-#define DMA_HISR_TEIF4 DMA_HISR_TEIF(DMA_STREAM4)
-#define DMA_HISR_TEIF5 DMA_HISR_TEIF(DMA_STREAM5)
-#define DMA_HISR_TEIF6 DMA_HISR_TEIF(DMA_STREAM6)
-#define DMA_HISR_TEIF7 DMA_HISR_TEIF(DMA_STREAM7)
-
-/* DMEIF: Direct Mode Error interrupt flag, streams 4-7 only */
-#define DMA_HISR_DMEIF_BIT DMA_ISR_DMEIF
-#define DMA_HISR_DMEIF(stream) (DMA_HISR_DMEIF_BIT << (DMA_ISR_OFFSET(stream - 4))
-
-#define DMA_HISR_DMEIF4 DMA_HISR_DMEIF(DMA_STREAM4)
-#define DMA_HISR_DMEIF5 DMA_HISR_DMEIF(DMA_STREAM5)
-#define DMA_HISR_DMEIF6 DMA_HISR_DMEIF(DMA_STREAM6)
-#define DMA_HISR_DMEIF7 DMA_HISR_DMEIF(DMA_STREAM7)
-
-/* Interrupt #1 is reserved */
-
-/* FEIF: FIFO Error interrupt flag, streams 4-7 only */
-#define DMA_HISR_FEIF_BIT DMA_ISR_FEIF
-#define DMA_HISR_FEIF(stream) (DMA_HISR_FEIF_BIT << (DMA_ISR_OFFSET(stream - 4))
-
-#define DMA_HISR_FEIF4 DMA_HISR_FEIF(DMA_STREAM4)
-#define DMA_HISR_FEIF5 DMA_HISR_FEIF(DMA_STREAM5)
-#define DMA_HISR_FEIF6 DMA_HISR_FEIF(DMA_STREAM6)
-#define DMA_HISR_FEIF7 DMA_HISR_FEIF(DMA_STREAM7)
-
-/* --- DMA_LIFCR values ------------------------------------------------------ */
-
-/* TCIF: Transfer complete interrupt flag, streams 0-3 only */
-#define DMA_LIFCR_CTCIF_BIT DMA_ISR_TCIF
-#define DMA_LIFCR_CTCIF(stream) (DMA_LIFCR_CTCIF_BIT << DMA_ISR_OFFSET(stream))
-
-#define DMA_LIFCR_CTCIF0 DMA_LIFCR_CTCIF(DMA_STREAM0)
-#define DMA_LIFCR_CTCIF1 DMA_LIFCR_CTCIF(DMA_STREAM1)
-#define DMA_LIFCR_CTCIF2 DMA_LIFCR_CTCIF(DMA_STREAM2)
-#define DMA_LIFCR_CTCIF3 DMA_LIFCR_CTCIF(DMA_STREAM3)
-
-/* HTIF: Half transfer interrupt flag, streams 0-3 only */
-#define DMA_LIFCR_CHTIF_BIT DMA_ISR_HTIF
-#define DMA_LIFCR_CHTIF(stream) (DMA_LIFCR_CHTIF_BIT << DMA_ISR_OFFSET(stream))
-
-#define DMA_LIFCR_CHTIF0 DMA_LIFCR_CHTIF(DMA_STREAM0)
-#define DMA_LIFCR_CHTIF1 DMA_LIFCR_CHTIF(DMA_STREAM1)
-#define DMA_LIFCR_CHTIF2 DMA_LIFCR_CHTIF(DMA_STREAM2)
-#define DMA_LIFCR_CHTIF3 DMA_LIFCR_CHTIF(DMA_STREAM3)
-
-/* TEIF: Transfer error interrupt flag, streams 0-3 only */
-#define DMA_LIFCR_CTEIF_BIT DMA_ISR_TEIF
-#define DMA_LIFCR_CTEIF(stream) (DMA_LIFCR_CTEIF_BIT << DMA_ISR_OFFSET(stream))
-
-#define DMA_LIFCR_CTEIF0 DMA_LIFCR_CTEIF(DMA_STREAM0)
-#define DMA_LIFCR_CTEIF1 DMA_LIFCR_CTEIF(DMA_STREAM1)
-#define DMA_LIFCR_CTEIF2 DMA_LIFCR_CTEIF(DMA_STREAM2)
-#define DMA_LIFCR_CTEIF3 DMA_LIFCR_CTEIF(DMA_STREAM3)
-
-/* DMEIF: Direct Mode Error interrupt flag, streams 0-3 only */
-#define DMA_LIFCR_CDMEIF_BIT DMA_ISR_DMEIF
-#define DMA_LIFCR_CDMEIF(stream) (DMA_LIFCR_CDMEIF_BIT << DMA_ISR_OFFSET(stream))
-
-#define DMA_LIFCR_CDMEIF0 DMA_LIFCR_CDMEIF(DMA_STREAM0)
-#define DMA_LIFCR_CDMEIF1 DMA_LIFCR_CDMEIF(DMA_STREAM1)
-#define DMA_LIFCR_CDMEIF2 DMA_LIFCR_CDMEIF(DMA_STREAM2)
-#define DMA_LIFCR_CDMEIF3 DMA_LIFCR_CDMEIF(DMA_STREAM3)
-
-/* Interrupt #1 is reserved */
-
-/* FEIF: FIFO Error interrupt flag, streams 0-3 only */
-#define DMA_LIFCR_CFEIF_BIT DMA_ISR_FEIF
-#define DMA_LIFCR_CFEIF(stream) (DMA_LIFCR_CFEIF_BIT << DMA_ISR_OFFSET(stream))
-
-#define DMA_LIFCR_CFEIF0 DMA_LIFCR_CFEIF(DMA_STREAM0)
-#define DMA_LIFCR_CFEIF1 DMA_LIFCR_CFEIF(DMA_STREAM1)
-#define DMA_LIFCR_CFEIF2 DMA_LIFCR_CFEIF(DMA_STREAM2)
-#define DMA_LIFCR_CFEIF3 DMA_LIFCR_CFEIF(DMA_STREAM3)
-
-/* --- DMA_HIFCR values ------------------------------------------------------ */
-
-/* TCIF: Transfer complete interrupt flag, streams 4-7 only */
-#define DMA_HIFCR_CTCIF_BIT DMA_ISR_TCIF
-#define DMA_HIFCR_CTCIF(stream) (DMA_HIFCR_CTCIF_BIT << (DMA_ISR_OFFSET(stream - 4))
-
-#define DMA_HIFCR_CTCIF4 DMA_HIFCR_CTCIF(DMA_STREAM4)
-#define DMA_HIFCR_CTCIF5 DMA_HIFCR_CTCIF(DMA_STREAM5)
-#define DMA_HIFCR_CTCIF6 DMA_HIFCR_CTCIF(DMA_STREAM6)
-#define DMA_HIFCR_CTCIF7 DMA_HIFCR_CTCIF(DMA_STREAM7)
-
-/* HTIF: Half transfer interrupt flag, streams 4-7 only */
-#define DMA_HIFCR_CHTIF_BIT DMA_ISR_HTIF
-#define DMA_HIFCR_CHTIF(stream) (DMA_HIFCR_CHTIF_BIT << (DMA_ISR_OFFSET(stream - 4))
-
-#define DMA_HIFCR_CHTIF4 DMA_HIFCR_CHTIF(DMA_STREAM4)
-#define DMA_HIFCR_CHTIF5 DMA_HIFCR_CHTIF(DMA_STREAM5)
-#define DMA_HIFCR_CHTIF6 DMA_HIFCR_CHTIF(DMA_STREAM6)
-#define DMA_HIFCR_CHTIF7 DMA_HIFCR_CHTIF(DMA_STREAM7)
-
-/* TEIF: Transfer error interrupt flag, streams 4-7 only */
-#define DMA_HIFCR_CTEIF_BIT DMA_ISR_TEIF
-#define DMA_HIFCR_CTEIF(stream) (DMA_HIFCR_CTEIF_BIT << (DMA_ISR_OFFSET(stream - 4))
-
-#define DMA_HIFCR_CTEIF4 DMA_HIFCR_CTEIF(DMA_STREAM4)
-#define DMA_HIFCR_CTEIF5 DMA_HIFCR_CTEIF(DMA_STREAM5)
-#define DMA_HIFCR_CTEIF6 DMA_HIFCR_CTEIF(DMA_STREAM6)
-#define DMA_HIFCR_CTEIF7 DMA_HIFCR_CTEIF(DMA_STREAM7)
-
-/* DMEIF: Direct Mode Error interrupt flag, streams 4-7 only */
-#define DMA_HIFCR_CDMEIF_BIT DMA_ISR_DMEIF
-#define DMA_HIFCR_CDMEIF(stream) (DMA_HIFCR_CDMEIF_BIT << (DMA_ISR_OFFSET(stream - 4))
-
-#define DMA_HIFCR_CDMEIF4 DMA_HIFCR_CDMEIF(DMA_STREAM4)
-#define DMA_HIFCR_CDMEIF5 DMA_HIFCR_CDMEIF(DMA_STREAM5)
-#define DMA_HIFCR_CDMEIF6 DMA_HIFCR_CDMEIF(DMA_STREAM6)
-#define DMA_HIFCR_CDMEIF7 DMA_HIFCR_CDMEIF(DMA_STREAM7)
-
-/* Interrupt #1 is reserved */
-
-/* FEIF: FIFO Error interrupt flag, streams 4-7 only */
-#define DMA_HIFCR_CFEIF_BIT DMA_ISR_FEIF
-#define DMA_HIFCR_CFEIF(stream) (DMA_HIFCR_CFEIF_BIT << (DMA_ISR_OFFSET(stream - 4))
-
-#define DMA_HIFCR_CFEIF4 DMA_HIFCR_CFEIF(DMA_STREAM4)
-#define DMA_HIFCR_CFEIF5 DMA_HIFCR_CFEIF(DMA_STREAM5)
-#define DMA_HIFCR_CFEIF6 DMA_HIFCR_CFEIF(DMA_STREAM6)
-#define DMA_HIFCR_CFEIF7 DMA_HIFCR_CFEIF(DMA_STREAM7)
-
-/* --- DMA_SxCR generic values --------------------------------------------- */
-
-/* Reserved [31:28] */
-
-/* CHSEL[13:12]: Channel Select */
-/** @defgroup dma_ch_sel DMA Channel Select
-@ingroup STM32F4xx_dma_defines
-
-@{*/
-#define DMA_SCR_CHSEL_0 (0x0 << 25)
-#define DMA_SCR_CHSEL_1 (0x1 << 25)
-#define DMA_SCR_CHSEL_2 (0x2 << 25)
-#define DMA_SCR_CHSEL_3 (0x3 << 25)
-#define DMA_SCR_CHSEL_4 (0x4 << 25)
-#define DMA_SCR_CHSEL_5 (0x5 << 25)
-#define DMA_SCR_CHSEL_6 (0x6 << 25)
-#define DMA_SCR_CHSEL_7 (0x7 << 25)
-/**@}*/
-#define DMA_SCR_CHSEL_MASK (0x7 << 25)
-#define DMA_SCR_CHSEL_SHIFT 25
-
-/* MBURST[13:12]: Memory Burst Configuration */
-/** @defgroup dma_mburst DMA Memory Burst Length
-@ingroup STM32F4xx_dma_defines
-
-@{*/
-#define DMA_SCR_MBURST_INCR0 (0x0 << 23)
-#define DMA_SCR_MBURST_INCR4 (0x1 << 23)
-#define DMA_SCR_MBURST_INCR8 (0x2 << 23)
-#define DMA_SCR_MBURST_INCR16 (0x3 << 23)
-/**@}*/
-#define DMA_SCR_MBURST_MASK (0x3 << 23)
-#define DMA_SCR_MBURST_SHIFT 23
-
-/* PBURST[13:12]: Peripheral Burst Configuration */
-/** @defgroup dma_pburst DMA Peripheral Burst Length
-@ingroup STM32F4xx_dma_defines
-
-@{*/
-#define DMA_SCR_PBURST_INCR0 (0x0 << 21)
-#define DMA_SCR_PBURST_INCR4 (0x1 << 21)
-#define DMA_SCR_PBURST_INCR8 (0x2 << 21)
-#define DMA_SCR_PBURST_INCR16 (0x3 << 21)
-/**@}*/
-#define DMA_SCR_PBURST_MASK (0x3 << 21)
-#define DMA_SCR_PBURST_SHIFT 21
-
-/* Bit 20 reserved */
-
-/* CT: Current target (in double buffered mode) */
-#define DMA_SCR_CT (1 << 19)
-
-/* DBM: Double buffered mode */
-#define DMA_SCR_DBM (1 << 18)
-
-/* PL[17:16]: Stream priority level */
-/** @defgroup dma_st_pri DMA Stream Priority Levels
-@ingroup STM32F4xx_dma_defines
-
-@{*/
-#define DMA_SCR_PL_LOW (0x0 << 16)
-#define DMA_SCR_PL_MEDIUM (0x1 << 16)
-#define DMA_SCR_PL_HIGH (0x2 << 16)
-#define DMA_SCR_PL_VERY_HIGH (0x3 << 16)
-/**@}*/
-#define DMA_SCR_PL_MASK (0x3 << 16)
-#define DMA_SCR_PL_SHIFT 16
-
-/* PINCOS: Peripheral increment offset size */
-#define DMA_SCR_PINCOS (1 << 15)
-
-/* MSIZE[14:13]: Memory size */
-/** @defgroup dma_st_memwidth DMA Stream Memory Word Width
-@ingroup STM32F4xx_dma_defines
-
-@{*/
-#define DMA_SCR_MSIZE_8BIT (0x0 << 13)
-#define DMA_SCR_MSIZE_16BIT (0x1 << 13)
-#define DMA_SCR_MSIZE_32BIT (0x2 << 13)
-/**@}*/
-#define DMA_SCR_MSIZE_MASK (0x3 << 13)
-#define DMA_SCR_MSIZE_SHIFT 13
-
-/* PSIZE[12:11]: Peripheral size */
-/** @defgroup dma_st_perwidth DMA Stream Peripheral Word Width
-@ingroup STM32F4xx_dma_defines
-
-@{*/
-#define DMA_SCR_PSIZE_8BIT (0x0 << 11)
-#define DMA_SCR_PSIZE_16BIT (0x1 << 11)
-#define DMA_SCR_PSIZE_32BIT (0x2 << 11)
-/**@}*/
-#define DMA_SCR_PSIZE_MASK (0x3 << 11)
-#define DMA_SCR_PSIZE_SHIFT 11
-
-/* MINC: Memory increment mode */
-#define DMA_SCR_MINC (1 << 10)
-
-/* PINC: Peripheral increment mode */
-#define DMA_SCR_PINC (1 << 9)
-
-/* CIRC: Circular mode */
-#define DMA_SCR_CIRC (1 << 8)
-
-/* DIR[7:6]: Data transfer direction */
-/** @defgroup dma_st_dir DMA Stream Data transfer direction
-@ingroup STM32F4xx_dma_defines
-
-@{*/
-#define DMA_SCR_DIR_PER2MEM (0x0 << 6)
-#define DMA_SCR_DIR_MEM2PER (0x1 << 6)
-#define DMA_SCR_DIR_MEM2MEM (0x2 << 6)
-/**@}*/
-#define DMA_SCR_DIR_MASK (0x3 << 6)
-#define DMA_SCR_DIR_SHIFT 6
-
-/* PFCTRL: Peripheral Flow Controller */
-#define DMA_SCR_PFCTRL (1 << 5)
-
-/* TCIE: Transfer complete interrupt enable */
-#define DMA_SCR_TCIE (1 << 4)
-
-/* HTIE: Half transfer interrupt enable */
-#define DMA_SCR_HTIE (1 << 3)
-
-/* TEIE: Transfer error interrupt enable */
-#define DMA_SCR_TEIE (1 << 2)
-
-/* DMEIE: Direct Mode error interrupt enable */
-#define DMA_SCR_DMEIE (1 << 1)
-
-/* EN: Stream enable */
-#define DMA_SCR_EN (1 << 0)
-
-/* --- DMA_SxNDTR values --------------------------------------------------- */
-
-/* NDT[15:0]: Number of data to transfer */
-
-/* --- DMA_SxPAR values ---------------------------------------------------- */
-
-/* PA[31:0]: Peripheral address */
-
-/* --- DMA_SxM0AR values ---------------------------------------------------- */
-
-/* M0A[31:0]: Memory address */
-
-/* --- DMA_SxM1AR values ---------------------------------------------------- */
-
-/* M1A[31:0]: Memory address */
-
-/* --- DMA_SxFCR generic values --------------------------------------------- */
-
-/* Reserved [31:8] */
-
-/* FEIE: FIFO error interrupt enable */
-#define DMA_FCR_FEIE (1 << 7)
-
-/* Bit 6 reserved */
-
-/* FS[5:3]: FIFO Status */
-/** @defgroup dma_fifo_status FIFO Status
-@ingroup STM32F4xx_dma_defines
-
-@{*/
-#define DMA_FCR_FS_LOW (0x0 << 3)
-#define DMA_FCR_FS_UNDER_HALF (0x1 << 3)
-#define DMA_FCR_FS_MEDIUM (0x2 << 3)
-#define DMA_FCR_FS_HIGH (0x3 << 3)
-#define DMA_FCR_FS_EMPTY (0x4 << 3)
-#define DMA_FCR_FS_FULL (0x5 << 3)
-/**@}*/
-#define DMA_FCR_FS_MASK (0x7 << 3)
-#define DMA_FCR_FS_SHIFT 3
-
-/* DMDIS: Direct Mode disable */
-#define DMA_FCR_DMDIS (1 << 2)
-
-/* FTH[1:0]: FIFO Threshold selection */
-/** @defgroup dma_fifo_thresh FIFO Threshold selection
-@ingroup STM32F4xx_dma_defines
-
-@{*/
-#define DMA_FCR_FTH_LOW (0x0 << 0)
-#define DMA_FCR_FTH_HALF (0x1 << 0)
-#define DMA_FCR_FTH_MEDIUM (0x2 << 0)
-#define DMA_FCR_FTH_FULL (0x3 << 0)
-/**@}*/
-#define DMA_FCR_FTH_MASK (0x3 << 0)
-#define DMA_FCR_FTH_SHIFT 3
-
-/* --- Generic values ------------------------------------------------------ */
-
-/** @defgroup dma_st_number DMA Stream Number
-@ingroup STM32F4xx_dma_defines
-
-@{*/
-#define DMA_STREAM0 0
-#define DMA_STREAM1 1
-#define DMA_STREAM2 2
-#define DMA_STREAM3 3
-#define DMA_STREAM4 4
-#define DMA_STREAM5 5
-#define DMA_STREAM6 6
-#define DMA_STREAM7 7
-/**@}*/
-
-/* --- function prototypes ------------------------------------------------- */
-
-BEGIN_DECLS
-
-void dma_stream_reset(u32 dma, u8 stream);
-void dma_clear_interrupt_flags(u32 dma, u8 stream, u32 interrupts);
-bool dma_get_interrupt_flag(u32 dma, u8 stream, u32 interrupt);
-void dma_set_transfer_mode(u32 dma, u8 stream, u32 direction);
-void dma_set_priority(u32 dma, u8 stream, u32 prio);
-void dma_set_memory_size(u32 dma, u8 stream, u32 mem_size);
-void dma_set_peripheral_size(u32 dma, u8 stream, u32 peripheral_size);
-void dma_enable_memory_increment_mode(u32 dma, u8 stream);
-void dma_disable_memory_increment_mode(u32 dma, u8 channel);
-void dma_enable_peripheral_increment_mode(u32 dma, u8 stream);
-void dma_disable_peripheral_increment_mode(u32 dma, u8 channel);
-void dma_enable_fixed_peripheral_increment_mode(u32 dma, u8 stream);
-void dma_enable_circular_mode(u32 dma, u8 stream);
-void dma_channel_select(u32 dma, u8 stream, u32 channel);
-void dma_channel_select(u32 dma, u8 stream, u32 channel);
-void dma_set_memory_burst(u32 dma, u8 stream, u32 burst);
-void dma_set_peripheral_burst(u32 dma, u8 stream, u32 burst);
-void dma_set_initial_target(u32 dma, u8 stream, u8 memory);
-u8 dma_get_target(u32 dma, u8 stream);
-void dma_enable_double_buffer_mode(u32 dma, u8 stream);
-void dma_set_peripheral_flow_control(u32 dma, u8 stream);
-void dma_set_dma_flow_control(u32 dma, u8 stream);
-void dma_enable_transfer_error_interrupt(u32 dma, u8 stream);
-void dma_disable_transfer_error_interrupt(u32 dma, u8 stream);
-void dma_enable_half_transfer_interrupt(u32 dma, u8 stream);
-void dma_disable_half_transfer_interrupt(u32 dma, u8 stream);
-void dma_enable_transfer_complete_interrupt(u32 dma, u8 stream);
-void dma_disable_transfer_complete_interrupt(u32 dma, u8 stream);
-u32 dma_fifo_status(u32 dma, u8 stream);
-void dma_enable_direct_mode_error_interrupt(u32 dma, u8 stream);
-void dma_disable_direct_mode_error_interrupt(u32 dma, u8 stream);
-void dma_enable_fifo_error_interrupt(u32 dma, u8 stream);
-void dma_disable_fifo_error_interrupt(u32 dma, u8 stream);
-void dma_enable_direct_mode(u32 dma, u8 stream);
-void dma_enable_fifo_mode(u32 dma, u8 stream);
-void dma_set_fifo_threshold(u32 dma, u8 stream, u32 threshold);
-void dma_enable_stream(u32 dma, u8 stream);
-void dma_disable_stream(u32 dma, u8 stream);
-void dma_set_peripheral_address(u32 dma, u8 stream, u32 address);
-void dma_set_memory_address(u32 dma, u8 stream, u32 address);
-void dma_set_memory_address_1(u32 dma, u8 stream, u32 address);
-void dma_set_number_of_data(u32 dma, u8 stream, u16 number);
-
-END_DECLS
+#include <libopencm3/stm32/f2/memorymap.h>
+#include <libopencm3/stm32/common/dma_common_f24.h>
#endif
-/**@}*/
diff --git a/lib/stm32/common/dma_common_f24.c b/lib/stm32/common/dma_common_f24.c
new file mode 100644
index 0000000..504c30e
--- /dev/null
+++ b/lib/stm32/common/dma_common_f24.c
@@ -0,0 +1,780 @@
+/** @addtogroup dma_file
+
+@version 1.0.0
+
+@author @htmlonly &copy; @endhtmlonly 2012 Ken Sarkies <ksarkies@internode.on.net>
+
+@date 30 November 2012
+
+This library supports the DMA Control System in the STM32F2 and STM32F4
+series of ARM Cortex Microcontrollers by ST Microelectronics.
+
+Up to two DMA controllers are supported each with 8 streams, and each stream
+having up to 8 channels hardware dedicated to various peripheral DMA signals.
+
+DMA transfers can be configured to occur between peripheral and memory in
+either direction, and memory to memory. Peripheral to peripheral transfer
+is not supported. Circular mode transfers are also supported in transfers
+involving a peripheral. An arbiter is provided to resolve priority DMA
+requests. Transfers can be made with 8, 16 or 32 bit words.
+
+Each stream has access to a 4 word deep FIFO and can use double buffering
+by means of two memory pointers. When using the FIFO it is possible to
+configure transfers to occur in indivisible bursts.
+
+It is also possible to select a peripheral to control the flow of data rather
+than the DMA controller. This limits the functionality but is udeful when the
+number of transfers is unknown.
+
+LGPL License Terms @ref lgpl_license
+ */
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2012 Ken Sarkies <ksarkies@internode.on.net>
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**@{*/
+
+#include <libopencm3/stm32/f4/dma.h>
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Reset
+
+The specified stream is disabled and configuration registers are cleared.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_stream_reset(u32 dma, u8 stream)
+{
+/* Disable stream (must be done before register is otherwise changed). */
+ DMA_SCR(dma, stream) &= ~DMA_SxCR_EN;
+/* Reset all config bits. */
+ DMA_SCR(dma, stream) = 0;
+/* Reset data transfer number. */
+ DMA_SNDTR(dma, stream) = 0;
+/* Reset peripheral and memory addresses. */
+ DMA_SPAR(dma, stream) = 0;
+ DMA_SM0AR(dma, stream) = 0;
+ DMA_SM1AR(dma, stream) = 0;
+/* This is the default setting */
+ DMA_SFCR(dma, stream) = 0x21;
+/* Reset all stream interrupt flags using the interrupt flag clear register. */
+ u32 mask = DMA_ISR_MASK(stream);
+ if (stream < 4)
+ {
+ DMA_LIFCR(dma) |= mask;
+ }
+ else
+ {
+ DMA_HIFCR(dma) |= mask;
+ }
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Clear Interrupt Flag
+
+The interrupt flag for the stream is cleared. More than one interrupt for the
+same stream may be cleared by using the bitwise OR of the interrupt flags.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] interrupts unsigned int32. Bitwise OR of interrupt numbers: @ref dma_if_offset
+*/
+
+void dma_clear_interrupt_flags(u32 dma, u8 stream, u32 interrupts)
+{
+/* Get offset to interrupt flag location in stream field */
+ u32 flags = (interrupts << DMA_ISR_OFFSET(stream));
+/* First four streams are in low register. Flag clear must be set then reset. */
+ if (stream < 4)
+ {
+ DMA_LIFCR(dma) = flags;
+ }
+ else
+ {
+ DMA_HIFCR(dma) = flags;
+ }
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Read Interrupt Flag
+
+The interrupt flag for the stream is returned.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] interrupt unsigned int32. Interrupt number: @ref dma_if_offset
+@returns bool interrupt flag is set.
+*/
+
+bool dma_get_interrupt_flag(u32 dma, u8 stream, u32 interrupt)
+{
+/* get offset to interrupt flag location in stream field.
+Assumes stream and interrupt parameters are integers */
+ u32 flag = (interrupt << DMA_ISR_OFFSET(stream));
+/* First four streams are in low register */
+ if (stream < 4) return ((DMA_LISR(dma) & flag) > 0);
+ else return ((DMA_HISR(dma) & flag) > 0);
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Enable Transfer Direction
+
+Set peripheral to memory, memory to peripheral or memory to memory. If memory
+to memory mode is selected, circular mode and double buffer modes are disabled.
+Ensure that these modes are not enabled at a later time.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] direction unsigned int32. Data transfer direction @ref dma_st_dir
+*/
+
+void dma_set_transfer_mode(u32 dma, u8 stream, u32 direction)
+{
+ u32 reg32 = (DMA_SCR(dma, stream) & ~DMA_SxCR_DIR_MASK);
+/* Disable circular and double buffer modes if memory to memory transfers
+are in effect (Direct Mode is automatically disabled by hardware) */
+ if (direction == DMA_SxCR_DIR_MEM_TO_MEM)
+ {
+ reg32 &= ~(DMA_SxCR_CIRC | DMA_SxCR_DBM);
+ }
+ DMA_SCR(dma, stream) = (reg32 | direction);
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set Priority
+
+Stream Priority has four levels: low to very high. This has precedence over the
+hardware priority. In the event of equal software priority the lower numbered
+stream has priority.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] prio unsigned int32. Priority level @ref dma_st_pri.
+*/
+
+void dma_set_priority(u32 dma, u8 stream, u32 prio)
+{
+ DMA_SCR(dma, stream) &= ~(DMA_SxCR_PL_MASK);
+ DMA_SCR(dma, stream) |= prio;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set Memory Word Width
+
+Set the memory word width 8 bits, 16 bits, or 32 bits. Refer to datasheet for
+alignment information if the source and destination widths do not match.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] mem_size unsigned int32. Memory word width @ref dma_st_memwidth.
+*/
+
+void dma_set_memory_size(u32 dma, u8 stream, u32 mem_size)
+{
+
+ DMA_SCR(dma, stream) &= ~(DMA_SxCR_MSIZE_MASK);
+ DMA_SCR(dma, stream) |= mem_size;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set Peripheral Word Width
+
+Set the peripheral word width 8 bits, 16 bits, or 32 bits. Refer to datasheet for
+alignment information if the source and destination widths do not match, or
+if the peripheral does not support byte or half-word writes.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] peripheral_size unsigned int32. Peripheral word width @ref dma_st_perwidth.
+*/
+
+void dma_set_peripheral_size(u32 dma, u8 stream, u32 peripheral_size)
+{
+ DMA_SCR(dma, stream) &= ~(DMA_SxCR_PSIZE_MASK);
+ DMA_SCR(dma, stream) |= peripheral_size;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Enable Memory Increment after Transfer
+
+Following each transfer the current memory address is incremented by
+1, 2 or 4 depending on the data size set in @ref dma_set_memory_size. The
+value held by the base memory address register is unchanged.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_memory_increment_mode(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) |= DMA_SxCR_MINC;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Channel Disable Memory Increment after Transfer
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_disable_memory_increment_mode(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) &= ~DMA_SxCR_MINC;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Channel Enable Variable Sized Peripheral Increment after Transfer
+
+Following each transfer the current peripheral address is incremented by
+1, 2 or 4 depending on the data size set in @ref dma_set_peripheral_size. The
+value held by the base peripheral address register is unchanged.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_peripheral_increment_mode(u32 dma, u8 stream)
+{
+ u32 reg32 = (DMA_SCR(dma, stream) | DMA_SxCR_PINC);
+ DMA_SCR(dma, stream) = (reg32 & ~DMA_SxCR_PINCOS);
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Channel Disable Peripheral Increment after Transfer
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_disable_peripheral_increment_mode(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) &= ~DMA_SxCR_PINC;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Channel Enable Fixed Sized Peripheral Increment after Transfer
+
+Following each transfer the current peripheral address is incremented by
+4 regardless of the data size. The value held by the base peripheral address
+register is unchanged.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_fixed_peripheral_increment_mode(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) |= (DMA_SxCR_PINC | DMA_SxCR_PINCOS);
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Enable Memory Circular Mode
+
+After the number of bytes/words to be transferred has been completed, the
+original transfer block size, memory and peripheral base addresses are
+reloaded and the process repeats.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@note This cannot be used with memory to memory mode. It is disabled
+automatically if the peripheral is selected as the flow controller.
+It is enabled automatically if double buffered mode is selected.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_circular_mode(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) |= DMA_SxCR_CIRC;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Channel Select
+
+Associate an input channel to the stream. Not every channel is allocated to a
+hardware DMA request signal. The allocations for each stream are given in the
+STM32F4 Reference Manual.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] channel unsigned int8. Channel selection @ref dma_ch_sel
+*/
+
+void dma_channel_select(u32 dma, u8 stream, u32 channel)
+{
+ DMA_SCR(dma, stream) |= channel;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set Memory Burst Configuration
+
+Set the memory burst type to none, 4 8 or 16 word length. This is forced to none
+if direct mode is used.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] burst unsigned int8. Memory Burst selection @ref dma_mburst
+*/
+
+void dma_set_memory_burst(u32 dma, u8 stream, u32 burst)
+{
+ u32 reg32 = (DMA_SCR(dma, stream) & ~DMA_SxCR_MBURST_MASK);
+ DMA_SCR(dma, stream) = (reg32 | burst);
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set Peripheral Burst Configuration
+
+Set the memory burst type to none, 4 8 or 16 word length. This is forced to none
+if direct mode is used.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] burst unsigned int8. Peripheral Burst selection @ref dma_pburst
+*/
+
+void dma_set_peripheral_burst(u32 dma, u8 stream, u32 burst)
+{
+ u32 reg32 = (DMA_SCR(dma, stream) & ~DMA_SxCR_PBURST_MASK);
+ DMA_SCR(dma, stream) = (reg32 | burst);
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set Initial Target Memory
+
+In double buffered mode, set the target memory (M0 or M1) to be used for the first
+transfer.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] memory unsigned int8. Initial memory pointer to use: 0 or 1
+*/
+
+void dma_set_initial_target(u32 dma, u8 stream, u8 memory)
+{
+ u32 reg32 = (DMA_SCR(dma, stream) & ~DMA_SxCR_CT);
+ if (memory == 1) reg32 |= DMA_SxCR_CT;
+ DMA_SCR(dma, stream) = reg32;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Read Current Memory Target
+
+In double buffer mode, return the current memory target (M0 or M1). It is possible
+to update the memory pointer in the register that is <b> not </b> currently in
+use. An attempt to change the register currently in use will cause the stream
+to be disabled and the transfer error flag to be set.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@returns unsigned int8. Memory buffer in use: 0 or 1
+*/
+
+u8 dma_get_target(u32 dma, u8 stream)
+{
+ if (DMA_SCR(dma, stream) & DMA_SxCR_CT) return 1;
+ return 0;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Enable Double Buffer Mode
+
+Double buffer mode is used for memory to/from peripheral transfers only, and in
+circular mode which is automatically enabled. Two memory buffers must be
+established with pointers stored in the memory pointer registers.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@note This cannot be used with memory to memory mode.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_double_buffer_mode(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) |= DMA_SxCR_DBM;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Disable Double Buffer Mode
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_disable_double_buffer_mode(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) &= ~DMA_SxCR_DBM;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set Peripheral Flow Control
+
+Set the peripheral to control DMA flow. Useful when the number of transfers is
+unknown. This is forced off when memory to memory mode is selected.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_set_peripheral_flow_control(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) |= DMA_SxCR_PFCTRL;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set DMA Flow Control
+
+Set the DMA controller to control DMA flow. This is the default.
+
+Ensure that the stream is disabled otherwise the setting will not be changed.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_set_dma_flow_control(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) &= ~DMA_SxCR_PFCTRL;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Enable Interrupt on Transfer Error
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_transfer_error_interrupt(u32 dma, u8 stream)
+{
+ dma_clear_interrupt_flags(dma, stream, DMA_ISR_TEIF);
+ DMA_SCR(dma, stream) |= DMA_SxCR_TEIE;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Disable Interrupt on Transfer Error
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_disable_transfer_error_interrupt(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) &= ~DMA_SxCR_TEIE;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Enable Interrupt on Transfer Half Complete
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_half_transfer_interrupt(u32 dma, u8 stream)
+{
+ dma_clear_interrupt_flags(dma, stream, DMA_ISR_HTIF);
+ DMA_SCR(dma, stream) |= DMA_SxCR_HTIE;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Disable Interrupt on Transfer Half Complete
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_disable_half_transfer_interrupt(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) &= ~DMA_SxCR_HTIE;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Enable Interrupt on Transfer Complete
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_transfer_complete_interrupt(u32 dma, u8 stream)
+{
+ dma_clear_interrupt_flags(dma, stream, DMA_ISR_TCIF);
+ DMA_SCR(dma, stream) |= DMA_SxCR_TCIE;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Disable Interrupt on Transfer Complete
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_disable_transfer_complete_interrupt(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) &= ~DMA_SxCR_TCIE;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Enable Interrupt on Direct Mode Error
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_direct_mode_error_interrupt(u32 dma, u8 stream)
+{
+ dma_clear_interrupt_flags(dma, stream, DMA_ISR_DMEIF);
+ DMA_SCR(dma, stream) |= DMA_SxCR_DMEIE;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Disable Interrupt on Direct Mode Error
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_disable_direct_mode_error_interrupt(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) &= ~DMA_SxCR_DMEIE;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Enable Interrupt on FIFO Error
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_fifo_error_interrupt(u32 dma, u8 stream)
+{
+ dma_clear_interrupt_flags(dma, stream, DMA_ISR_FEIF);
+ DMA_SFCR(dma, stream) |= DMA_SxFCR_FEIE;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Disable Interrupt on FIFO Error
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_disable_fifo_error_interrupt(u32 dma, u8 stream)
+{
+ DMA_SFCR(dma, stream) &= ~DMA_SxFCR_FEIE;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Get FIFO Status
+
+Status of FIFO (empty. full or partial filled states) is returned. This has no
+meaning if direct mode is enabled (as the FIFO is not used).
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@returns u32 FIFO Status @ref dma_fifo_status
+*/
+
+u32 dma_fifo_status(u32 dma, u8 stream)
+{
+ return (DMA_SFCR(dma, stream) & DMA_SxFCR_FS_MASK);
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Enable Direct Mode
+
+Direct mode is the default. Data is transferred as soon as a DMA request is
+received. The FIFO is not used. This must not be set when memory to memory
+mode is selected.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_direct_mode(u32 dma, u8 stream)
+{
+ DMA_SFCR(dma, stream) &= ~DMA_SxFCR_DMDIS;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Enable FIFO Mode
+
+Data is transferred via a FIFO.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_fifo_mode(u32 dma, u8 stream)
+{
+ DMA_SFCR(dma, stream) |= DMA_SxFCR_DMDIS;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Set FIFO Threshold
+
+This is the filled level at which data is transferred out of the FIFO to the
+destination.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] threshold unsigned int8. Threshold setting @ref dma_fifo_thresh
+*/
+
+void dma_set_fifo_threshold(u32 dma, u8 stream, u32 threshold)
+{
+ u32 reg32 = (DMA_SFCR(dma, stream) & ~DMA_SxFCR_FTH_MASK);
+ DMA_SFCR(dma, stream) = (reg32 | threshold);
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Enable
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_enable_stream(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) |= DMA_SxCR_EN;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Disable
+
+@note The DMA stream registers retain their values when the stream is disabled.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+*/
+
+void dma_disable_stream(u32 dma, u8 stream)
+{
+ DMA_SCR(dma, stream) &= ~DMA_SxCR_EN;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set the Peripheral Address
+
+Set the address of the peripheral register to or from which data is to be transferred.
+Refer to the documentation for the specific peripheral.
+
+@note The DMA stream must be disabled before setting this address. This function
+has no effect if the stream is enabled.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] address unsigned int32. Peripheral Address.
+*/
+
+void dma_set_peripheral_address(u32 dma, u8 stream, u32 address)
+{
+ if (!(DMA_SCR(dma, stream) & DMA_SxCR_EN))
+ DMA_SPAR(dma, stream) = (u32 *) address;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set the Base Memory Address 0
+
+Set the address pointer to the memory location for DMA transfers. The DMA stream
+must normally be disabled before setting this address, however it is possible
+to change this in double buffer mode when the current target is memory area 1
+(see @ref dma_get_target).
+
+This is the default base memory address used in direct mode.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] address unsigned int32. Memory Initial Address.
+*/
+
+void dma_set_memory_address(u32 dma, u8 stream, u32 address)
+{
+ u32 reg32 = DMA_SCR(dma, stream);
+ if ( !(reg32 & DMA_SxCR_EN) || ((reg32 & DMA_SxCR_CT) && (reg32 & DMA_SxCR_DBM)) )
+ DMA_SM0AR(dma, stream) = (u32 *) address;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set the Base Memory Address 1
+
+Set the address pointer to the memory location for DMA transfers. The DMA stream
+must normally be disabled before setting this address, however it is possible
+to change this in double buffer mode when the current target is memory area 0
+(see @ref dma_get_target).
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] address unsigned int32. Memory Initial Address.
+*/
+
+void dma_set_memory_address_1(u32 dma, u8 stream, u32 address)
+{
+ u32 reg32 = DMA_SCR(dma, stream);
+ if ( !(reg32 & DMA_SxCR_EN) || (!(reg32 & DMA_SxCR_CT) && (reg32 & DMA_SxCR_DBM)) )
+ DMA_SM1AR(dma, stream) = (u32 *) address;
+}
+
+/*-----------------------------------------------------------------------------*/
+/** @brief DMA Stream Set the Transfer Block Size
+
+@note The DMA stream must be disabled before setting this count value. The count
+is not changed if the stream is enabled.
+
+@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
+@param[in] stream unsigned int8. Stream number: @ref dma_st_number
+@param[in] number unsigned int16. Number of data words to transfer (65535 maximum).
+*/
+
+void dma_set_number_of_data(u32 dma, u8 stream, u16 number)
+{
+ DMA_SNDTR(dma, stream) = number;
+}
+/**@}*/
+
diff --git a/lib/stm32/f2/Makefile b/lib/stm32/f2/Makefile
index b890fa4..c6a274d 100644
--- a/lib/stm32/f2/Makefile
+++ b/lib/stm32/f2/Makefile
@@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \
ARFLAGS = rcs
OBJS = rcc.o gpio.o usart.o spi.o flash.o \
i2c.o exti2.o timer.o \
- gpio_common_all.o gpio_common_f24.o
+ gpio_common_all.o gpio_common_f24.o dma_common_f24.o
VPATH += ../../usb:../:../../cm3:../common
diff --git a/lib/stm32/f2/dma.c b/lib/stm32/f2/dma.c
new file mode 100644
index 0000000..8e8f702
--- /dev/null
+++ b/lib/stm32/f2/dma.c
@@ -0,0 +1,28 @@
+/** @defgroup dma_file DMA
+
+@ingroup STM32F2xx
+
+@brief <b>libopencm3 STM32F2xx DMA</b>
+
+*/
+
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/dma.h>
+#include <libopencm3/stm32/common/dma_common_f24.h>
+
diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile
index c9ad847..a73dbae 100644
--- a/lib/stm32/f4/Makefile
+++ b/lib/stm32/f4/Makefile
@@ -33,7 +33,7 @@ OBJS = rcc.o gpio.o usart.o spi.o flash.o \
i2c.o exti2.o pwr.o timer.o \
usb.o usb_standard.o usb_control.o usb_fx07_common.o usb_f107.o \
usb_f207.o adc.o dma.o \
- gpio_common_all.o gpio_common_f24.o
+ gpio_common_all.o gpio_common_f24.o dma_common_f24.o
VPATH += ../../usb:../:../../cm3:../common
diff --git a/lib/stm32/f4/dma.c b/lib/stm32/f4/dma.c
index 7c80dcf..c9f5db6 100644
--- a/lib/stm32/f4/dma.c
+++ b/lib/stm32/f4/dma.c
@@ -1,42 +1,14 @@
-/** @defgroup STM32F4xx-dma-file DMA
+/** @defgroup dma_file DMA
@ingroup STM32F4xx
-@brief <b>libopencm3 STM32F4xx DMA Controller</b>
+@brief <b>libopencm3 STM32F4xx DMA</b>
-@version 1.0.0
-
-@author @htmlonly &copy; @endhtmlonly 2012 Ken Sarkies <ksarkies@internode.on.net>
-
-@date 18 October 2012
-
-This library supports the DMA Control System in the STM32F2 and STM32F4
-series of ARM Cortex Microcontrollers by ST Microelectronics.
-
-Up to two DMA controllers are supported each with 8 streams, and each stream
-having up to 8 channels hardware dedicated to various peripheral DMA signals.
-
-DMA transfers can be configured to occur between peripheral and memory in
-either direction, and memory to memory. Peripheral to peripheral transfer
-is not supported. Circular mode transfers are also supported in transfers
-involving a peripheral. An arbiter is provided to resolve priority DMA
-requests. Transfers can be made with 8, 16 or 32 bit words.
-
-Each stream has access to a 4 word deep FIFO and can use double buffering
-by means of two memory pointers. When using the FIFO it is possible to
-configure transfers to occur in indivisible bursts.
-
-It is also possible to select a peripheral to control the flow of data rather
-than the DMA controller. This limits the functionality but is udeful when the
-number of transfers is unknown.
+*/
-LGPL License Terms @ref lgpl_license
- */
/*
* This file is part of the libopencm3 project.
*
- * Copyright (C) 2012 Ken Sarkies <ksarkies@internode.on.net>
- *
* This library is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -51,722 +23,6 @@ LGPL License Terms @ref lgpl_license
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-/**@{*/
-
-#include <libopencm3/stm32/f4/dma.h>
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Reset
-
-The specified stream is disabled and configuration registers are cleared.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_stream_reset(u32 dma, u8 stream)
-{
-/* Disable stream (must be done before register is otherwise changed). */
- DMA_SCR(dma, stream) &= ~DMA_SCR_EN;
-/* Reset all config bits. */
- DMA_SCR(dma, stream) = 0;
-/* Reset data transfer number. */
- DMA_SNDTR(dma, stream) = 0;
-/* Reset peripheral and memory addresses. */
- DMA_SPAR(dma, stream) = 0;
- DMA_SM0AR(dma, stream) = 0;
- DMA_SM1AR(dma, stream) = 0;
-/* This is the default setting */
- DMA_SFCR(dma, stream) = 0x21;
-/* Reset all stream interrupt flags using the interrupt flag clear register. */
- u32 mask = DMA_ISR_MASK(stream);
- if (stream < 4)
- {
- DMA_LIFCR(dma) |= mask;
- }
- else
- {
- DMA_HIFCR(dma) |= mask;
- }
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Clear Interrupt Flag
-
-The interrupt flag for the stream is cleared. More than one interrupt for the
-same stream may be cleared by using the logical OR of the interrupt flags.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] interrupts unsigned int32. Logical OR of interrupt numbers: @ref dma_if_offset
-*/
-
-void dma_clear_interrupt_flags(u32 dma, u8 stream, u32 interrupts)
-{
-/* Get offset to interrupt flag location in stream field */
- u32 flags = (interrupts << DMA_ISR_OFFSET(stream));
-/* First four streams are in low register. Flag clear must be set then reset. */
- if (stream < 4)
- {
- DMA_LIFCR(dma) = flags;
- }
- else
- {
- DMA_HIFCR(dma) = flags;
- }
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Read Interrupt Flag
-
-The interrupt flag for the stream is returned.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] interrupt unsigned int32. Interrupt number: @ref dma_if_offset
-@returns bool interrupt flag is set.
-*/
-
-bool dma_get_interrupt_flag(u32 dma, u8 stream, u32 interrupt)
-{
-/* get offset to interrupt flag location in stream field.
-Assumes stream and interrupt parameters are integers */
- u32 flag = (interrupt << DMA_ISR_OFFSET(stream));
-/* First four streams are in low register */
- if (stream < 4) return ((DMA_LISR(dma) & flag) > 0);
- else return ((DMA_HISR(dma) & flag) > 0);
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Enable Transfer Direction
-
-Set peripheral to memory, memory to peripheral or memory to memory. If memory
-to memory mode is selected, circular mode and double buffer modes are disabled.
-Ensure that these modes are not enabled at a later time.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] direction unsigned int32. Data transfer direction @ref dma_st_dir
-*/
-
-void dma_set_transfer_mode(u32 dma, u8 stream, u32 direction)
-{
- u32 reg32 = (DMA_SCR(dma, stream) & ~DMA_SCR_DIR_MASK);
-/* Disable circular and double buffer modes if memory to memory transfers
-are in effect (Direct Mode is automatically disabled by hardware) */
- if (direction == DMA_SCR_DIR_MEM2MEM)
- {
- reg32 &= ~(DMA_SCR_CIRC | DMA_SCR_DBM);
- }
- DMA_SCR(dma, stream) = (reg32 | direction);
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set Priority
-
-Stream Priority has four levels: low to very high. This has precedence over the
-hardware priority. In the event of equal software priority the lower numbered
-stream has priority.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] prio unsigned int32. Priority level @ref dma_st_pri.
-*/
-
-void dma_set_priority(u32 dma, u8 stream, u32 prio)
-{
- DMA_SCR(dma, stream) &= ~(DMA_SCR_PL_MASK);
- DMA_SCR(dma, stream) |= prio;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set Memory Word Width
-
-Set the memory word width 8 bits, 16 bits, or 32 bits. Refer to datasheet for
-alignment information if the source and destination widths do not match.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] mem_size unsigned int32. Memory word width @ref dma_st_memwidth.
-*/
-
-void dma_set_memory_size(u32 dma, u8 stream, u32 mem_size)
-{
-
- DMA_SCR(dma, stream) &= ~(DMA_SCR_MSIZE_MASK);
- DMA_SCR(dma, stream) |= mem_size;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set Peripheral Word Width
-
-Set the peripheral word width 8 bits, 16 bits, or 32 bits. Refer to datasheet for
-alignment information if the source and destination widths do not match, or
-if the peripheral does not support byte or half-word writes.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] peripheral_size unsigned int32. Peripheral word width @ref dma_st_perwidth.
-*/
-
-void dma_set_peripheral_size(u32 dma, u8 stream, u32 peripheral_size)
-{
- DMA_SCR(dma, stream) &= ~(DMA_SCR_PSIZE_MASK);
- DMA_SCR(dma, stream) |= peripheral_size;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Enable Memory Increment after Transfer
-
-Following each transfer the current memory address is incremented by
-1, 2 or 4 depending on the data size set in @ref dma_set_memory_size. The
-value held by the base memory address register is unchanged.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_memory_increment_mode(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) |= DMA_SCR_MINC;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Channel Disable Memory Increment after Transfer
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_disable_memory_increment_mode(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) &= ~DMA_SCR_MINC;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Channel Enable Variable Sized Peripheral Increment after Transfer
-
-Following each transfer the current peripheral address is incremented by
-1, 2 or 4 depending on the data size set in @ref dma_set_peripheral_size. The
-value held by the base peripheral address register is unchanged.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_peripheral_increment_mode(u32 dma, u8 stream)
-{
- u32 reg32 = (DMA_SCR(dma, stream) | DMA_SCR_PINC);
- DMA_SCR(dma, stream) = (reg32 & ~DMA_SCR_PINCOS);
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Channel Disable Peripheral Increment after Transfer
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_disable_peripheral_increment_mode(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) &= ~DMA_SCR_PINC;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Channel Enable Fixed Sized Peripheral Increment after Transfer
-
-Following each transfer the current peripheral address is incremented by
-4 regardless of the data size. The value held by the base peripheral address
-register is unchanged.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_fixed_peripheral_increment_mode(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) |= (DMA_SCR_PINC | DMA_SCR_PINCOS);
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Enable Memory Circular Mode
-
-After the number of bytes/words to be transferred has been completed, the
-original transfer block size, memory and peripheral base addresses are
-reloaded and the process repeats.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@note This cannot be used with memory to memory mode. It is disabled
-automatically if the peripheral is selected as the flow controller.
-It is enabled automatically if double buffered mode is selected.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_circular_mode(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) |= DMA_SCR_CIRC;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Channel Select
-
-Associate an input channel to the stream. Not every channel is allocated to a
-hardware DMA request signal. The allocations for each stream are given in the
-STM32F4 Reference Manual.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] channel unsigned int8. Channel selection @ref dma_ch_sel
-*/
-
-void dma_channel_select(u32 dma, u8 stream, u32 channel)
-{
- DMA_SCR(dma, stream) |= channel;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set Memory Burst Configuration
-
-Set the memory burst type to none, 4 8 or 16 word length. This is forced to none
-if direct mode is used.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] burst unsigned int8. Memory Burst selection @ref dma_mburst
-*/
-
-void dma_set_memory_burst(u32 dma, u8 stream, u32 burst)
-{
- u32 reg32 = (DMA_SCR(dma, stream) & ~DMA_SCR_MBURST_MASK);
- DMA_SCR(dma, stream) = (reg32 | burst);
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set Peripheral Burst Configuration
-
-Set the memory burst type to none, 4 8 or 16 word length. This is forced to none
-if direct mode is used.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] burst unsigned int8. Peripheral Burst selection @ref dma_pburst
-*/
-
-void dma_set_peripheral_burst(u32 dma, u8 stream, u32 burst)
-{
- u32 reg32 = (DMA_SCR(dma, stream) & ~DMA_SCR_PBURST_MASK);
- DMA_SCR(dma, stream) = (reg32 | burst);
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set Initial Target Memory
-
-In double buffered mode, set the target memory (M0 or M1) to be used for the first
-transfer.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] memory unsigned int8. Initial memory pointer to use: 0 or 1
-*/
-
-void dma_set_initial_target(u32 dma, u8 stream, u8 memory)
-{
- u32 reg32 = (DMA_SCR(dma, stream) & ~DMA_SCR_CT);
- if (memory == 1) reg32 |= DMA_SCR_CT;
- DMA_SCR(dma, stream) = reg32;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Read Current Memory Target
-
-In double buffer mode, return the current memory target (M0 or M1). It is possible
-to update the memory pointer in the register that is <b> not </b> currently in
-use. An attempt to change the register currently in use will cause the stream
-to be disabled and the transfer error flag to be set.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@returns unsigned int8. Memory buffer in use: 0 or 1
-*/
-
-u8 dma_get_target(u32 dma, u8 stream)
-{
- if (DMA_SCR(dma, stream) & DMA_SCR_CT) return 1;
- return 0;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Enable Double Buffer Mode
-
-Double buffer mode is used for memory to/from peripheral transfers only, and in
-circular mode which is automatically enabled. Two memory buffers must be
-established with pointers stored in the memory pointer registers.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@note This cannot be used with memory to memory mode.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_double_buffer_mode(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) |= DMA_SCR_DBM;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set Peripheral Flow Control
-
-Set the peripheral to control DMA flow. Useful when the number of transfers is
-unknown. This is forced off when memory to memory mode is selected.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_set_peripheral_flow_control(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) |= DMA_SCR_PFCTRL;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set DMA Flow Control
-
-Set the DMA controller to control DMA flow. This is the default.
-
-Ensure that the stream is disabled otherwise the setting will not be changed.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_set_dma_flow_control(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) &= ~DMA_SCR_PFCTRL;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Enable Interrupt on Transfer Error
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_transfer_error_interrupt(u32 dma, u8 stream)
-{
- dma_clear_interrupt_flags(dma, stream, DMA_ISR_TEIF);
- DMA_SCR(dma, stream) |= DMA_SCR_TEIE;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Disable Interrupt on Transfer Error
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_disable_transfer_error_interrupt(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) &= ~DMA_SCR_TEIE;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Enable Interrupt on Transfer Half Complete
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_half_transfer_interrupt(u32 dma, u8 stream)
-{
- dma_clear_interrupt_flags(dma, stream, DMA_ISR_HTIF);
- DMA_SCR(dma, stream) |= DMA_SCR_HTIE;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Disable Interrupt on Transfer Half Complete
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_disable_half_transfer_interrupt(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) &= ~DMA_SCR_HTIE;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Enable Interrupt on Transfer Complete
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_transfer_complete_interrupt(u32 dma, u8 stream)
-{
- dma_clear_interrupt_flags(dma, stream, DMA_ISR_TCIF);
- DMA_SCR(dma, stream) |= DMA_SCR_TCIE;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Disable Interrupt on Transfer Complete
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_disable_transfer_complete_interrupt(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) &= ~DMA_SCR_TCIE;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Enable Interrupt on Direct Mode Error
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_direct_mode_error_interrupt(u32 dma, u8 stream)
-{
- dma_clear_interrupt_flags(dma, stream, DMA_ISR_DMEIF);
- DMA_SCR(dma, stream) |= DMA_SCR_DMEIE;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Disable Interrupt on Direct Mode Error
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_disable_direct_mode_error_interrupt(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) &= ~DMA_SCR_DMEIE;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Enable Interrupt on FIFO Error
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_fifo_error_interrupt(u32 dma, u8 stream)
-{
- dma_clear_interrupt_flags(dma, stream, DMA_ISR_FEIF);
- DMA_SFCR(dma, stream) |= DMA_FCR_FEIE;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Disable Interrupt on FIFO Error
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_disable_fifo_error_interrupt(u32 dma, u8 stream)
-{
- DMA_SFCR(dma, stream) &= ~DMA_FCR_FEIE;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Get FIFO Status
-
-Status of FIFO (empty. full or partial filled states) is returned. This has no
-meaning if direct mode is enabled (as the FIFO is not used).
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@returns u32 FIFO Status @ref dma_fifo_status
-*/
-
-u32 dma_fifo_status(u32 dma, u8 stream)
-{
- return (DMA_SFCR(dma, stream) & DMA_FCR_FS_MASK);
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Enable Direct Mode
-
-Direct mode is the default. Data is transferred as soon as a DMA request is
-received. The FIFO is not used. This must not be set when memory to memory
-mode is selected.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_direct_mode(u32 dma, u8 stream)
-{
- DMA_SFCR(dma, stream) &= ~DMA_FCR_DMDIS;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Enable FIFO Mode
-
-Data is transferred via a FIFO.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_fifo_mode(u32 dma, u8 stream)
-{
- DMA_SFCR(dma, stream) |= DMA_FCR_DMDIS;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Set FIFO Threshold
-
-This is the filled level at which data is transferred out of the FIFO to the
-destination.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] threshold unsigned int8. Threshold setting @ref dma_fifo_thresh
-*/
-
-void dma_set_fifo_threshold(u32 dma, u8 stream, u32 threshold)
-{
- u32 reg32 = (DMA_SFCR(dma, stream) & ~DMA_FCR_FTH_MASK);
- DMA_SFCR(dma, stream) = (reg32 | threshold);
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Enable
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_enable_stream(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) |= DMA_SCR_EN;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Disable
-
-@note The DMA stream registers retain their values when the stream is disabled.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-*/
-
-void dma_disable_stream(u32 dma, u8 stream)
-{
- DMA_SCR(dma, stream) &= ~DMA_SCR_EN;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set the Peripheral Address
-
-Set the address of the peripheral register to or from which data is to be transferred.
-Refer to the documentation for the specific peripheral.
-
-@note The DMA stream must be disabled before setting this address. This function
-has no effect if the stream is enabled.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] address unsigned int32. Peripheral Address.
-*/
-
-void dma_set_peripheral_address(u32 dma, u8 stream, u32 address)
-{
- if (!(DMA_SCR(dma, stream) & DMA_SCR_EN))
- DMA_SPAR(dma, stream) = (u32) address;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set the Base Memory Address 0
-
-Set the address pointer to the memory location for DMA transfers. The DMA stream
-must normally be disabled before setting this address, however it is possible
-to change this in double buffer mode when the current target is memory area 1
-(see @ref dma_get_target).
-
-This is the default base memory address used in direct mode.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] address unsigned int32. Memory Initial Address.
-*/
-
-void dma_set_memory_address(u32 dma, u8 stream, u32 address)
-{
- u32 reg32 = DMA_SCR(dma, stream);
- if ( !(reg32 & DMA_SCR_EN) || ((reg32 & DMA_SCR_CT) && (reg32 & DMA_SCR_DBM)) )
- DMA_SM0AR(dma, stream) = (u32) address;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set the Base Memory Address 1
-
-Set the address pointer to the memory location for DMA transfers. The DMA stream
-must normally be disabled before setting this address, however it is possible
-to change this in double buffer mode when the current target is memory area 0
-(see @ref dma_get_target).
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] address unsigned int32. Memory Initial Address.
-*/
-
-void dma_set_memory_address_1(u32 dma, u8 stream, u32 address)
-{
- u32 reg32 = DMA_SCR(dma, stream);
- if ( !(reg32 & DMA_SCR_EN) || (!(reg32 & DMA_SCR_CT) && (reg32 & DMA_SCR_DBM)) )
- DMA_SM1AR(dma, stream) = (u32) address;
-}
-
-/*-----------------------------------------------------------------------------*/
-/** @brief DMA Stream Set the Transfer Block Size
-
-@note The DMA stream must be disabled before setting this count value. The count
-is not changed if the stream is enabled.
-
-@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
-@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] number unsigned int16. Number of data words to transfer (65535 maximum).
-*/
-
-void dma_set_number_of_data(u32 dma, u8 stream, u16 number)
-{
- DMA_SNDTR(dma, stream) = number;
-}
-/**@}*/
+#include <libopencm3/stm32/dma.h>
+#include <libopencm3/stm32/common/dma_common_f24.h>