aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Palsson2013-02-06 11:47:23 +0000
committerKarl Palsson2013-02-06 11:47:23 +0000
commit7afc13930f86f226cac27abc63a68afed0b119ec (patch)
tree16fcf9c8f364230ad942be91770ab6bb6ee60690
parente4c0a50286cd7bdca76f7bc4dfa973668114e9ec (diff)
[stm32] Use common memorymap include for consistency
Most peripheral headers simply include <libopencm3/stm32/memorymap.h> which, like the rest of libopencm3 requires the correct compiler define flag to be set. A few peripherals were directly including the platform include, libopencm3/stm32/xx/memorymap.h, and in some of those cases it wasn't even correctly including the correct platform. (Likely the result of copy/paste errors) These direct includes have been eliminated
-rw-r--r--include/libopencm3/stm32/f1/dma.h2
-rw-r--r--include/libopencm3/stm32/f2/dma.h2
-rw-r--r--include/libopencm3/stm32/f2/rng.h2
-rw-r--r--include/libopencm3/stm32/f4/adc.h2
-rw-r--r--include/libopencm3/stm32/f4/dma.h2
-rw-r--r--include/libopencm3/stm32/f4/rng.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/include/libopencm3/stm32/f1/dma.h b/include/libopencm3/stm32/f1/dma.h
index 4af8f43..e0c55a6 100644
--- a/include/libopencm3/stm32/f1/dma.h
+++ b/include/libopencm3/stm32/f1/dma.h
@@ -34,7 +34,7 @@ LGPL License Terms @ref lgpl_license
#ifndef 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>
#endif
diff --git a/include/libopencm3/stm32/f2/dma.h b/include/libopencm3/stm32/f2/dma.h
index 8226f55..0eb952c 100644
--- a/include/libopencm3/stm32/f2/dma.h
+++ b/include/libopencm3/stm32/f2/dma.h
@@ -34,7 +34,7 @@ LGPL License Terms @ref lgpl_license
#ifndef 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>
#endif
diff --git a/include/libopencm3/stm32/f2/rng.h b/include/libopencm3/stm32/f2/rng.h
index 63d03fe..403c7c7 100644
--- a/include/libopencm3/stm32/f2/rng.h
+++ b/include/libopencm3/stm32/f2/rng.h
@@ -18,7 +18,7 @@
#ifndef 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>
#endif
diff --git a/include/libopencm3/stm32/f4/adc.h b/include/libopencm3/stm32/f4/adc.h
index 272c4c2..e400591 100644
--- a/include/libopencm3/stm32/f4/adc.h
+++ b/include/libopencm3/stm32/f4/adc.h
@@ -36,7 +36,7 @@ LGPL License Terms @ref lgpl_license
#ifndef LIBOPENCM3_ADC_H
#define LIBOPENCM3_ADC_H
-#include <libopencm3/stm32/f4/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32/f4/dma.h b/include/libopencm3/stm32/f4/dma.h
index cc97024..a3e9db1 100644
--- a/include/libopencm3/stm32/f4/dma.h
+++ b/include/libopencm3/stm32/f4/dma.h
@@ -34,7 +34,7 @@ LGPL License Terms @ref lgpl_license
#ifndef 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>
#endif
diff --git a/include/libopencm3/stm32/f4/rng.h b/include/libopencm3/stm32/f4/rng.h
index b72f801..e8e6cc4 100644
--- a/include/libopencm3/stm32/f4/rng.h
+++ b/include/libopencm3/stm32/f4/rng.h
@@ -18,7 +18,7 @@
#ifndef 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>
#endif