jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #92 "DMA tidyup"

Browse Source 
Merge remote-tracking branch 'karlp/dma_tidy'
This commit is contained in:
Piotr Esden-Tempski 2013-02-18 14:14:22 -08:00
commit b4634ba8ff
7 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libopencm3/stm32/f1/dma.h
View File

@ -34,7 +34,7 @@ LGPL License Terms @ref lgpl_license
#ifndef LIBOPENCM3_DMA_H #ifndef LIBOPENCM3_DMA_H
#define LIBOPENCM3_DMA_H #define LIBOPENCM3_DMA_H
#include <libopencm3/stm32/f2/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/stm32/common/dma_common_f13.h> #include <libopencm3/stm32/common/dma_common_f13.h>
#endif #endif

2
include/libopencm3/stm32/f2/dma.h
View File

@ -34,7 +34,7 @@ LGPL License Terms @ref lgpl_license
#ifndef LIBOPENCM3_DMA_H #ifndef LIBOPENCM3_DMA_H
#define LIBOPENCM3_DMA_H #define LIBOPENCM3_DMA_H
#include <libopencm3/stm32/f2/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/stm32/common/dma_common_f24.h> #include <libopencm3/stm32/common/dma_common_f24.h>
#endif #endif

2
include/libopencm3/stm32/f2/rng.h
View File

@ -18,7 +18,7 @@
#ifndef LIBOPENCM3_RNG_F2_H #ifndef LIBOPENCM3_RNG_F2_H
#define LIBOPENCM3_RNG_F2_H #define LIBOPENCM3_RNG_F2_H
#include <libopencm3/stm32/f2/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/stm32/common/rng_common_f24.h> #include <libopencm3/stm32/common/rng_common_f24.h>
#endif #endif

2
include/libopencm3/stm32/f4/adc.h
View File

@ -36,7 +36,7 @@ LGPL License Terms @ref lgpl_license
#ifndef LIBOPENCM3_ADC_H #ifndef LIBOPENCM3_ADC_H
#define LIBOPENCM3_ADC_H #define LIBOPENCM3_ADC_H
#include <libopencm3/stm32/f4/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */ /* --- Convenience macros -------------------------------------------------- */

2
include/libopencm3/stm32/f4/dma.h
View File

@ -34,7 +34,7 @@ LGPL License Terms @ref lgpl_license
#ifndef LIBOPENCM3_DMA_H #ifndef LIBOPENCM3_DMA_H
#define LIBOPENCM3_DMA_H #define LIBOPENCM3_DMA_H
#include <libopencm3/stm32/f2/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/stm32/common/dma_common_f24.h> #include <libopencm3/stm32/common/dma_common_f24.h>
#endif #endif

2
include/libopencm3/stm32/f4/rng.h
View File

@ -18,7 +18,7 @@
#ifndef LIBOPENCM3_RNG_F4_H #ifndef LIBOPENCM3_RNG_F4_H
#define LIBOPENCM3_RNG_F4_H #define LIBOPENCM3_RNG_F4_H
#include <libopencm3/stm32/f4/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/stm32/common/rng_common_f24.h> #include <libopencm3/stm32/common/rng_common_f24.h>
#endif #endif

4
lib/stm32/common/dma_common_f13.c
View File

@ -55,9 +55,7 @@ The channel is disabled and configuration registers are cleared.
void dma_channel_reset(u32 dma, u8 channel) void dma_channel_reset(u32 dma, u8 channel)
{ {
/* Disable channel. */ /* Disable channel and reset config bits. */
DMA_CCR(dma, channel) &= ~DMA_CCR_EN;
/* Reset config bits. */
DMA_CCR(dma, channel) = 0; DMA_CCR(dma, channel) = 0;
/* Reset data transfer number. */ /* Reset data transfer number. */
DMA_CNDTR(dma, channel) = 0; DMA_CNDTR(dma, channel) = 0;