aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFergus Noble2011-09-14 13:47:33 -0700
committerFergus Noble2011-09-14 13:47:33 -0700
commitaf64b76bd6b89488f0cd1ad1a899367d6a28f655 (patch)
tree51eadfe8534f56c6e7fe6039853bf26f7fa4de19
parent87d4045c22d75143ed8f750c184966eeba55a3b6 (diff)
Restructuring stm32 include directories.
-rw-r--r--include/libopencm3/stm32/can.h (renamed from include/libopencm3/stm32_common/can.h)2
-rw-r--r--include/libopencm3/stm32/crc.h (renamed from include/libopencm3/stm32_common/crc.h)2
-rw-r--r--include/libopencm3/stm32/dbgmcu.h (renamed from include/libopencm3/stm32_common/dbgmcu.h)2
-rw-r--r--include/libopencm3/stm32/exti.h (renamed from include/libopencm3/stm32_common/exti.h)2
-rw-r--r--include/libopencm3/stm32/f1/adc.h (renamed from include/libopencm3/stm32f1/adc.h)0
-rw-r--r--include/libopencm3/stm32/f1/bkp.h (renamed from include/libopencm3/stm32f1/bkp.h)0
-rw-r--r--include/libopencm3/stm32/f1/dma.h (renamed from include/libopencm3/stm32f1/dma.h)0
-rw-r--r--include/libopencm3/stm32/f1/ethernet.h (renamed from include/libopencm3/stm32f1/ethernet.h)0
-rw-r--r--include/libopencm3/stm32/f1/flash.h (renamed from include/libopencm3/stm32f1/flash.h)0
-rw-r--r--include/libopencm3/stm32/f1/gpio.h (renamed from include/libopencm3/stm32f1/gpio.h)0
-rw-r--r--include/libopencm3/stm32/f1/memorymap.h (renamed from include/libopencm3/stm32f1/memorymap.h)0
-rw-r--r--include/libopencm3/stm32/f1/nvic.h (renamed from include/libopencm3/stm32f1/nvic.h)0
-rw-r--r--include/libopencm3/stm32/f1/otg_fs.h (renamed from include/libopencm3/stm32f1/otg_fs.h)0
-rw-r--r--include/libopencm3/stm32/f1/rcc.h (renamed from include/libopencm3/stm32f1/rcc.h)0
-rw-r--r--include/libopencm3/stm32/f1/rtc.h (renamed from include/libopencm3/stm32f1/rtc.h)0
-rw-r--r--include/libopencm3/stm32/f1/scb.h (renamed from include/libopencm3/stm32f1/scb.h)0
-rw-r--r--include/libopencm3/stm32/f1/systick.h (renamed from include/libopencm3/stm32f1/systick.h)0
-rw-r--r--include/libopencm3/stm32/f1/tools.h (renamed from include/libopencm3/stm32f1/tools.h)0
-rw-r--r--include/libopencm3/stm32/f1/usb.h (renamed from include/libopencm3/stm32f1/usb.h)0
-rw-r--r--include/libopencm3/stm32/f1/usb_desc.h (renamed from include/libopencm3/stm32f1/usb_desc.h)0
-rw-r--r--include/libopencm3/stm32/f2/memorymap.h (renamed from include/libopencm3/stm32f2/memorymap.h)0
-rw-r--r--include/libopencm3/stm32/f2/pwr.h (renamed from include/libopencm3/stm32f2/pwr.h)2
-rw-r--r--include/libopencm3/stm32/f2/spi.h (renamed from include/libopencm3/stm32f2/spi.h)2
-rw-r--r--include/libopencm3/stm32/f2/timer.h (renamed from include/libopencm3/stm32f2/timer.h)0
-rw-r--r--include/libopencm3/stm32/f2/usart.h (renamed from include/libopencm3/stm32f2/usart.h)2
-rw-r--r--include/libopencm3/stm32/fsmc.h (renamed from include/libopencm3/stm32_common/fsmc.h)2
-rw-r--r--include/libopencm3/stm32/i2c.h (renamed from include/libopencm3/stm32_common/i2c.h)2
-rw-r--r--include/libopencm3/stm32/iwdg.h (renamed from include/libopencm3/stm32_common/iwdg.h)2
-rw-r--r--include/libopencm3/stm32/memorymap.h (renamed from include/libopencm3/stm32_common/memorymap.h)2
-rw-r--r--include/libopencm3/stm32/pwr.h (renamed from include/libopencm3/stm32_common/pwr.h)2
-rw-r--r--include/libopencm3/stm32/spi.h (renamed from include/libopencm3/stm32_common/spi.h)2
-rw-r--r--include/libopencm3/stm32/timer.h (renamed from include/libopencm3/stm32_common/timer.h)2
-rw-r--r--include/libopencm3/stm32/usart.h (renamed from include/libopencm3/stm32_common/usart.h)2
-rw-r--r--include/libopencm3/stm32/wwdg.h (renamed from include/libopencm3/stm32_common/wwdg.h)2
34 files changed, 15 insertions, 17 deletions
diff --git a/include/libopencm3/stm32_common/can.h b/include/libopencm3/stm32/can.h
index eeac5d8..1aa95a1 100644
--- a/include/libopencm3/stm32_common/can.h
+++ b/include/libopencm3/stm32/can.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_CAN_H
#define LIBOPENCM3_CAN_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/crc.h b/include/libopencm3/stm32/crc.h
index a5bc35a..5ad866e 100644
--- a/include/libopencm3/stm32_common/crc.h
+++ b/include/libopencm3/stm32/crc.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_CRC_H
#define LIBOPENCM3_CRC_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- CRC registers ------------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/dbgmcu.h b/include/libopencm3/stm32/dbgmcu.h
index e6771a2..e753f5e 100644
--- a/include/libopencm3/stm32_common/dbgmcu.h
+++ b/include/libopencm3/stm32/dbgmcu.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_STM32_DBGMCU_H
#define LIBOPENCM3_STM32_DBGMCU_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- DBGMCU registers ---------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/exti.h b/include/libopencm3/stm32/exti.h
index caecee5..19ab547 100644
--- a/include/libopencm3/stm32_common/exti.h
+++ b/include/libopencm3/stm32/exti.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_EXTI_H
#define LIBOPENCM3_EXTI_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- EXTI registers ------------------------------------------------------ */
diff --git a/include/libopencm3/stm32f1/adc.h b/include/libopencm3/stm32/f1/adc.h
index 6e35d59..6e35d59 100644
--- a/include/libopencm3/stm32f1/adc.h
+++ b/include/libopencm3/stm32/f1/adc.h
diff --git a/include/libopencm3/stm32f1/bkp.h b/include/libopencm3/stm32/f1/bkp.h
index d700f9b..d700f9b 100644
--- a/include/libopencm3/stm32f1/bkp.h
+++ b/include/libopencm3/stm32/f1/bkp.h
diff --git a/include/libopencm3/stm32f1/dma.h b/include/libopencm3/stm32/f1/dma.h
index 7d0a856..7d0a856 100644
--- a/include/libopencm3/stm32f1/dma.h
+++ b/include/libopencm3/stm32/f1/dma.h
diff --git a/include/libopencm3/stm32f1/ethernet.h b/include/libopencm3/stm32/f1/ethernet.h
index 3d7f1ee..3d7f1ee 100644
--- a/include/libopencm3/stm32f1/ethernet.h
+++ b/include/libopencm3/stm32/f1/ethernet.h
diff --git a/include/libopencm3/stm32f1/flash.h b/include/libopencm3/stm32/f1/flash.h
index f9b2aa9..f9b2aa9 100644
--- a/include/libopencm3/stm32f1/flash.h
+++ b/include/libopencm3/stm32/f1/flash.h
diff --git a/include/libopencm3/stm32f1/gpio.h b/include/libopencm3/stm32/f1/gpio.h
index f1463a3..f1463a3 100644
--- a/include/libopencm3/stm32f1/gpio.h
+++ b/include/libopencm3/stm32/f1/gpio.h
diff --git a/include/libopencm3/stm32f1/memorymap.h b/include/libopencm3/stm32/f1/memorymap.h
index e3c57c8..e3c57c8 100644
--- a/include/libopencm3/stm32f1/memorymap.h
+++ b/include/libopencm3/stm32/f1/memorymap.h
diff --git a/include/libopencm3/stm32f1/nvic.h b/include/libopencm3/stm32/f1/nvic.h
index d29c425..d29c425 100644
--- a/include/libopencm3/stm32f1/nvic.h
+++ b/include/libopencm3/stm32/f1/nvic.h
diff --git a/include/libopencm3/stm32f1/otg_fs.h b/include/libopencm3/stm32/f1/otg_fs.h
index e1d7a6a..e1d7a6a 100644
--- a/include/libopencm3/stm32f1/otg_fs.h
+++ b/include/libopencm3/stm32/f1/otg_fs.h
diff --git a/include/libopencm3/stm32f1/rcc.h b/include/libopencm3/stm32/f1/rcc.h
index 1072445..1072445 100644
--- a/include/libopencm3/stm32f1/rcc.h
+++ b/include/libopencm3/stm32/f1/rcc.h
diff --git a/include/libopencm3/stm32f1/rtc.h b/include/libopencm3/stm32/f1/rtc.h
index b71525e..b71525e 100644
--- a/include/libopencm3/stm32f1/rtc.h
+++ b/include/libopencm3/stm32/f1/rtc.h
diff --git a/include/libopencm3/stm32f1/scb.h b/include/libopencm3/stm32/f1/scb.h
index 9594cf1..9594cf1 100644
--- a/include/libopencm3/stm32f1/scb.h
+++ b/include/libopencm3/stm32/f1/scb.h
diff --git a/include/libopencm3/stm32f1/systick.h b/include/libopencm3/stm32/f1/systick.h
index 7c2c9a3..7c2c9a3 100644
--- a/include/libopencm3/stm32f1/systick.h
+++ b/include/libopencm3/stm32/f1/systick.h
diff --git a/include/libopencm3/stm32f1/tools.h b/include/libopencm3/stm32/f1/tools.h
index ac7f0bf..ac7f0bf 100644
--- a/include/libopencm3/stm32f1/tools.h
+++ b/include/libopencm3/stm32/f1/tools.h
diff --git a/include/libopencm3/stm32f1/usb.h b/include/libopencm3/stm32/f1/usb.h
index e35075d..e35075d 100644
--- a/include/libopencm3/stm32f1/usb.h
+++ b/include/libopencm3/stm32/f1/usb.h
diff --git a/include/libopencm3/stm32f1/usb_desc.h b/include/libopencm3/stm32/f1/usb_desc.h
index da99bb0..da99bb0 100644
--- a/include/libopencm3/stm32f1/usb_desc.h
+++ b/include/libopencm3/stm32/f1/usb_desc.h
diff --git a/include/libopencm3/stm32f2/memorymap.h b/include/libopencm3/stm32/f2/memorymap.h
index 9fe77fa..9fe77fa 100644
--- a/include/libopencm3/stm32f2/memorymap.h
+++ b/include/libopencm3/stm32/f2/memorymap.h
diff --git a/include/libopencm3/stm32f2/pwr.h b/include/libopencm3/stm32/f2/pwr.h
index 49b3383..7cf8dab 100644
--- a/include/libopencm3/stm32f2/pwr.h
+++ b/include/libopencm3/stm32/f2/pwr.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_PWR_F2_H
#define LIBOPENCM3_PWR_F2_H
-#include <libopencm3/stm32_common/pwr.h>
+#include <libopencm3/stm32/pwr.h>
/*
* This file extends the version in stm_common with definitions only
diff --git a/include/libopencm3/stm32f2/spi.h b/include/libopencm3/stm32/f2/spi.h
index d4aa02e..62550cf 100644
--- a/include/libopencm3/stm32f2/spi.h
+++ b/include/libopencm3/stm32/f2/spi.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_SPI_F2_H
#define LIBOPENCM3_SPI_F2_H
-#include <libopencm3/stm32_common/spi.h>
+#include <libopencm3/stm32/spi.h>
/*
* This file extends the version in stm_common with definitions only
diff --git a/include/libopencm3/stm32f2/timer.h b/include/libopencm3/stm32/f2/timer.h
index f7c82ae..f7c82ae 100644
--- a/include/libopencm3/stm32f2/timer.h
+++ b/include/libopencm3/stm32/f2/timer.h
diff --git a/include/libopencm3/stm32f2/usart.h b/include/libopencm3/stm32/f2/usart.h
index 8d1caca..1baf5a1 100644
--- a/include/libopencm3/stm32f2/usart.h
+++ b/include/libopencm3/stm32/f2/usart.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_USART_F2_H
#define LIBOPENCM3_USART_F2_H
-#include <libopencm3/stm32_common/usart.h>
+#include <libopencm3/stm32/usart.h>
/* --- USART_CR1 values ---------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/fsmc.h b/include/libopencm3/stm32/fsmc.h
index 5ccd1d1..1d318e3 100644
--- a/include/libopencm3/stm32_common/fsmc.h
+++ b/include/libopencm3/stm32/fsmc.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_FSMC_H
#define LIBOPENCM3_FSMC_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/i2c.h b/include/libopencm3/stm32/i2c.h
index 1fa4f37..d182f4e 100644
--- a/include/libopencm3/stm32_common/i2c.h
+++ b/include/libopencm3/stm32/i2c.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_I2C_H
#define LIBOPENCM3_I2C_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/iwdg.h b/include/libopencm3/stm32/iwdg.h
index 67f2961..bf2784a 100644
--- a/include/libopencm3/stm32_common/iwdg.h
+++ b/include/libopencm3/stm32/iwdg.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_IWDG_H
#define LIBOPENCM3_IWDG_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- IWDG registers ------------------------------------------------------ */
diff --git a/include/libopencm3/stm32_common/memorymap.h b/include/libopencm3/stm32/memorymap.h
index 0d0c60f..17a919e 100644
--- a/include/libopencm3/stm32_common/memorymap.h
+++ b/include/libopencm3/stm32/memorymap.h
@@ -20,8 +20,6 @@
#ifndef LIBOPENCM3_MEMORYMAP_COMMON_H
#define LIBOPENCM3_MEMORYMAP_COMMON_H
-#include <libopencm3/cm3/memorymap.h>
-
#ifdef STM32F1
#include <libopencm3/stm32f1/memorymap.h>
#else
diff --git a/include/libopencm3/stm32_common/pwr.h b/include/libopencm3/stm32/pwr.h
index 4af8480..e5b9804 100644
--- a/include/libopencm3/stm32_common/pwr.h
+++ b/include/libopencm3/stm32/pwr.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_PWR_H
#define LIBOPENCM3_PWR_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- PWR registers ------------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/spi.h b/include/libopencm3/stm32/spi.h
index 3249457..3cadaf8 100644
--- a/include/libopencm3/stm32_common/spi.h
+++ b/include/libopencm3/stm32/spi.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_SPI_H
#define LIBOPENCM3_SPI_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* Registers can be accessed as 16bit or 32bit values. */
diff --git a/include/libopencm3/stm32_common/timer.h b/include/libopencm3/stm32/timer.h
index c1eac99..7b5df86 100644
--- a/include/libopencm3/stm32_common/timer.h
+++ b/include/libopencm3/stm32/timer.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_TIMER_H
#define LIBOPENCM3_TIMER_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/usart.h b/include/libopencm3/stm32/usart.h
index 0a1ed36..df6bc08 100644
--- a/include/libopencm3/stm32_common/usart.h
+++ b/include/libopencm3/stm32/usart.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_USART_H
#define LIBOPENCM3_USART_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/wwdg.h b/include/libopencm3/stm32/wwdg.h
index e1787c8..552d02e 100644
--- a/include/libopencm3/stm32_common/wwdg.h
+++ b/include/libopencm3/stm32/wwdg.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_WWDG_H
#define LIBOPENCM3_WWDG_H
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h>
/* --- WWDG registers ------------------------------------------------------ */