aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFergus Noble2011-09-12 20:48:41 -0700
committerStephen Caudle2011-10-12 22:13:01 -0400
commit76700510e08007fcbb461c22e71649bfa2bf95de (patch)
treebb4d556160281f7bb9d7a96725b1b1aaaa99da5c
parent424b094ce83e6c9ae577cef22e86054cc2d945a5 (diff)
Ability to choose memorymap for stm_common headers with define.
-rw-r--r--include/libopencm3/stm32_common/can.h2
-rw-r--r--include/libopencm3/stm32_common/crc.h2
-rw-r--r--include/libopencm3/stm32_common/dbgmcu.h2
-rw-r--r--include/libopencm3/stm32_common/exti.h2
-rw-r--r--include/libopencm3/stm32_common/fsmc.h2
-rw-r--r--include/libopencm3/stm32_common/iwdg.h2
-rw-r--r--include/libopencm3/stm32_common/memorymap.h35
-rw-r--r--include/libopencm3/stm32_common/wwdg.h2
8 files changed, 42 insertions, 7 deletions
diff --git a/include/libopencm3/stm32_common/can.h b/include/libopencm3/stm32_common/can.h
index 1aa95a1..eeac5d8 100644
--- a/include/libopencm3/stm32_common/can.h
+++ b/include/libopencm3/stm32_common/can.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_CAN_H
#define LIBOPENCM3_CAN_H
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/crc.h b/include/libopencm3/stm32_common/crc.h
index 5ad866e..a5bc35a 100644
--- a/include/libopencm3/stm32_common/crc.h
+++ b/include/libopencm3/stm32_common/crc.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_CRC_H
#define LIBOPENCM3_CRC_H
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- CRC registers ------------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/dbgmcu.h b/include/libopencm3/stm32_common/dbgmcu.h
index e753f5e..e6771a2 100644
--- a/include/libopencm3/stm32_common/dbgmcu.h
+++ b/include/libopencm3/stm32_common/dbgmcu.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_STM32_DBGMCU_H
#define LIBOPENCM3_STM32_DBGMCU_H
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- DBGMCU registers ---------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/exti.h b/include/libopencm3/stm32_common/exti.h
index 19ab547..caecee5 100644
--- a/include/libopencm3/stm32_common/exti.h
+++ b/include/libopencm3/stm32_common/exti.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_EXTI_H
#define LIBOPENCM3_EXTI_H
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- EXTI registers ------------------------------------------------------ */
diff --git a/include/libopencm3/stm32_common/fsmc.h b/include/libopencm3/stm32_common/fsmc.h
index 1d318e3..5ccd1d1 100644
--- a/include/libopencm3/stm32_common/fsmc.h
+++ b/include/libopencm3/stm32_common/fsmc.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_FSMC_H
#define LIBOPENCM3_FSMC_H
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/iwdg.h b/include/libopencm3/stm32_common/iwdg.h
index bf2784a..67f2961 100644
--- a/include/libopencm3/stm32_common/iwdg.h
+++ b/include/libopencm3/stm32_common/iwdg.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_IWDG_H
#define LIBOPENCM3_IWDG_H
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- IWDG registers ------------------------------------------------------ */
diff --git a/include/libopencm3/stm32_common/memorymap.h b/include/libopencm3/stm32_common/memorymap.h
new file mode 100644
index 0000000..0d0c60f
--- /dev/null
+++ b/include/libopencm3/stm32_common/memorymap.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_MEMORYMAP_COMMON_H
+#define LIBOPENCM3_MEMORYMAP_COMMON_H
+
+#include <libopencm3/cm3/memorymap.h>
+
+#ifdef STM32F1
+#include <libopencm3/stm32f1/memorymap.h>
+#else
+#ifdef STM32F1
+#include <libopencm3/stm32f2/memorymap.h>
+#else
+#error "stm32 family not defined."
+#endif
+#endif
+
+#endif
diff --git a/include/libopencm3/stm32_common/wwdg.h b/include/libopencm3/stm32_common/wwdg.h
index 552d02e..e1787c8 100644
--- a/include/libopencm3/stm32_common/wwdg.h
+++ b/include/libopencm3/stm32_common/wwdg.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_WWDG_H
#define LIBOPENCM3_WWDG_H
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- WWDG registers ------------------------------------------------------ */