From af64b76bd6b89488f0cd1ad1a899367d6a28f655 Mon Sep 17 00:00:00 2001 From: Fergus Noble Date: Wed, 14 Sep 2011 13:47:33 -0700 Subject: [PATCH] Restructuring stm32 include directories. --- include/libopencm3/{stm32_common => stm32}/can.h | 2 +- include/libopencm3/{stm32_common => stm32}/crc.h | 2 +- include/libopencm3/{stm32_common => stm32}/dbgmcu.h | 2 +- include/libopencm3/{stm32_common => stm32}/exti.h | 2 +- include/libopencm3/{stm32f1 => stm32/f1}/adc.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/bkp.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/dma.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/ethernet.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/flash.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/gpio.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/memorymap.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/nvic.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/otg_fs.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/rcc.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/rtc.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/scb.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/systick.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/tools.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/usb.h | 0 include/libopencm3/{stm32f1 => stm32/f1}/usb_desc.h | 0 include/libopencm3/{stm32f2 => stm32/f2}/memorymap.h | 0 include/libopencm3/{stm32f2 => stm32/f2}/pwr.h | 2 +- include/libopencm3/{stm32f2 => stm32/f2}/spi.h | 2 +- include/libopencm3/{stm32f2 => stm32/f2}/timer.h | 0 include/libopencm3/{stm32f2 => stm32/f2}/usart.h | 2 +- include/libopencm3/{stm32_common => stm32}/fsmc.h | 2 +- include/libopencm3/{stm32_common => stm32}/i2c.h | 2 +- include/libopencm3/{stm32_common => stm32}/iwdg.h | 2 +- include/libopencm3/{stm32_common => stm32}/memorymap.h | 2 -- include/libopencm3/{stm32_common => stm32}/pwr.h | 2 +- include/libopencm3/{stm32_common => stm32}/spi.h | 2 +- include/libopencm3/{stm32_common => stm32}/timer.h | 2 +- include/libopencm3/{stm32_common => stm32}/usart.h | 2 +- include/libopencm3/{stm32_common => stm32}/wwdg.h | 2 +- 34 files changed, 15 insertions(+), 17 deletions(-) rename include/libopencm3/{stm32_common => stm32}/can.h (99%) rename include/libopencm3/{stm32_common => stm32}/crc.h (97%) rename include/libopencm3/{stm32_common => stm32}/dbgmcu.h (97%) rename include/libopencm3/{stm32_common => stm32}/exti.h (97%) rename include/libopencm3/{stm32f1 => stm32/f1}/adc.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/bkp.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/dma.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/ethernet.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/flash.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/gpio.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/memorymap.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/nvic.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/otg_fs.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/rcc.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/rtc.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/scb.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/systick.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/tools.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/usb.h (100%) rename include/libopencm3/{stm32f1 => stm32/f1}/usb_desc.h (100%) rename include/libopencm3/{stm32f2 => stm32/f2}/memorymap.h (100%) rename include/libopencm3/{stm32f2 => stm32/f2}/pwr.h (96%) rename include/libopencm3/{stm32f2 => stm32/f2}/spi.h (97%) rename include/libopencm3/{stm32f2 => stm32/f2}/timer.h (100%) rename include/libopencm3/{stm32f2 => stm32/f2}/usart.h (96%) rename include/libopencm3/{stm32_common => stm32}/fsmc.h (99%) rename include/libopencm3/{stm32_common => stm32}/i2c.h (99%) rename include/libopencm3/{stm32_common => stm32}/iwdg.h (98%) rename include/libopencm3/{stm32_common => stm32}/memorymap.h (96%) rename include/libopencm3/{stm32_common => stm32}/pwr.h (97%) rename include/libopencm3/{stm32_common => stm32}/spi.h (99%) rename include/libopencm3/{stm32_common => stm32}/timer.h (99%) rename include/libopencm3/{stm32_common => stm32}/usart.h (99%) rename include/libopencm3/{stm32_common => stm32}/wwdg.h (97%) diff --git a/include/libopencm3/stm32_common/can.h b/include/libopencm3/stm32/can.h similarity index 99% rename from include/libopencm3/stm32_common/can.h rename to include/libopencm3/stm32/can.h index eeac5d80..1aa95a17 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 +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopencm3/stm32_common/crc.h b/include/libopencm3/stm32/crc.h similarity index 97% rename from include/libopencm3/stm32_common/crc.h rename to include/libopencm3/stm32/crc.h index a5bc35a5..5ad866e6 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 +#include #include /* --- CRC registers ------------------------------------------------------- */ diff --git a/include/libopencm3/stm32_common/dbgmcu.h b/include/libopencm3/stm32/dbgmcu.h similarity index 97% rename from include/libopencm3/stm32_common/dbgmcu.h rename to include/libopencm3/stm32/dbgmcu.h index e6771a26..e753f5ed 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 +#include #include /* --- DBGMCU registers ---------------------------------------------------- */ diff --git a/include/libopencm3/stm32_common/exti.h b/include/libopencm3/stm32/exti.h similarity index 97% rename from include/libopencm3/stm32_common/exti.h rename to include/libopencm3/stm32/exti.h index caecee5d..19ab5472 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 +#include #include /* --- EXTI registers ------------------------------------------------------ */ diff --git a/include/libopencm3/stm32f1/adc.h b/include/libopencm3/stm32/f1/adc.h similarity index 100% rename from include/libopencm3/stm32f1/adc.h rename to include/libopencm3/stm32/f1/adc.h diff --git a/include/libopencm3/stm32f1/bkp.h b/include/libopencm3/stm32/f1/bkp.h similarity index 100% rename from include/libopencm3/stm32f1/bkp.h rename to include/libopencm3/stm32/f1/bkp.h diff --git a/include/libopencm3/stm32f1/dma.h b/include/libopencm3/stm32/f1/dma.h similarity index 100% rename from include/libopencm3/stm32f1/dma.h rename to include/libopencm3/stm32/f1/dma.h diff --git a/include/libopencm3/stm32f1/ethernet.h b/include/libopencm3/stm32/f1/ethernet.h similarity index 100% rename from include/libopencm3/stm32f1/ethernet.h rename to include/libopencm3/stm32/f1/ethernet.h diff --git a/include/libopencm3/stm32f1/flash.h b/include/libopencm3/stm32/f1/flash.h similarity index 100% rename from include/libopencm3/stm32f1/flash.h rename to include/libopencm3/stm32/f1/flash.h diff --git a/include/libopencm3/stm32f1/gpio.h b/include/libopencm3/stm32/f1/gpio.h similarity index 100% rename from include/libopencm3/stm32f1/gpio.h rename to include/libopencm3/stm32/f1/gpio.h diff --git a/include/libopencm3/stm32f1/memorymap.h b/include/libopencm3/stm32/f1/memorymap.h similarity index 100% rename from include/libopencm3/stm32f1/memorymap.h rename to include/libopencm3/stm32/f1/memorymap.h diff --git a/include/libopencm3/stm32f1/nvic.h b/include/libopencm3/stm32/f1/nvic.h similarity index 100% rename from include/libopencm3/stm32f1/nvic.h rename to include/libopencm3/stm32/f1/nvic.h diff --git a/include/libopencm3/stm32f1/otg_fs.h b/include/libopencm3/stm32/f1/otg_fs.h similarity index 100% rename from include/libopencm3/stm32f1/otg_fs.h rename to include/libopencm3/stm32/f1/otg_fs.h diff --git a/include/libopencm3/stm32f1/rcc.h b/include/libopencm3/stm32/f1/rcc.h similarity index 100% rename from include/libopencm3/stm32f1/rcc.h rename to include/libopencm3/stm32/f1/rcc.h diff --git a/include/libopencm3/stm32f1/rtc.h b/include/libopencm3/stm32/f1/rtc.h similarity index 100% rename from include/libopencm3/stm32f1/rtc.h rename to include/libopencm3/stm32/f1/rtc.h diff --git a/include/libopencm3/stm32f1/scb.h b/include/libopencm3/stm32/f1/scb.h similarity index 100% rename from include/libopencm3/stm32f1/scb.h rename to include/libopencm3/stm32/f1/scb.h diff --git a/include/libopencm3/stm32f1/systick.h b/include/libopencm3/stm32/f1/systick.h similarity index 100% rename from include/libopencm3/stm32f1/systick.h rename to include/libopencm3/stm32/f1/systick.h diff --git a/include/libopencm3/stm32f1/tools.h b/include/libopencm3/stm32/f1/tools.h similarity index 100% rename from include/libopencm3/stm32f1/tools.h rename to include/libopencm3/stm32/f1/tools.h diff --git a/include/libopencm3/stm32f1/usb.h b/include/libopencm3/stm32/f1/usb.h similarity index 100% rename from include/libopencm3/stm32f1/usb.h rename to include/libopencm3/stm32/f1/usb.h diff --git a/include/libopencm3/stm32f1/usb_desc.h b/include/libopencm3/stm32/f1/usb_desc.h similarity index 100% rename from include/libopencm3/stm32f1/usb_desc.h rename to include/libopencm3/stm32/f1/usb_desc.h diff --git a/include/libopencm3/stm32f2/memorymap.h b/include/libopencm3/stm32/f2/memorymap.h similarity index 100% rename from include/libopencm3/stm32f2/memorymap.h rename to include/libopencm3/stm32/f2/memorymap.h diff --git a/include/libopencm3/stm32f2/pwr.h b/include/libopencm3/stm32/f2/pwr.h similarity index 96% rename from include/libopencm3/stm32f2/pwr.h rename to include/libopencm3/stm32/f2/pwr.h index 49b33834..7cf8dabf 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 +#include /* * 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 similarity index 97% rename from include/libopencm3/stm32f2/spi.h rename to include/libopencm3/stm32/f2/spi.h index d4aa02ed..62550cf9 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 +#include /* * 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 similarity index 100% rename from include/libopencm3/stm32f2/timer.h rename to include/libopencm3/stm32/f2/timer.h diff --git a/include/libopencm3/stm32f2/usart.h b/include/libopencm3/stm32/f2/usart.h similarity index 96% rename from include/libopencm3/stm32f2/usart.h rename to include/libopencm3/stm32/f2/usart.h index 8d1cacac..1baf5a19 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 +#include /* --- USART_CR1 values ---------------------------------------------------- */ diff --git a/include/libopencm3/stm32_common/fsmc.h b/include/libopencm3/stm32/fsmc.h similarity index 99% rename from include/libopencm3/stm32_common/fsmc.h rename to include/libopencm3/stm32/fsmc.h index 5ccd1d1f..1d318e31 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 +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopencm3/stm32_common/i2c.h b/include/libopencm3/stm32/i2c.h similarity index 99% rename from include/libopencm3/stm32_common/i2c.h rename to include/libopencm3/stm32/i2c.h index 1fa4f372..d182f4ed 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 +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopencm3/stm32_common/iwdg.h b/include/libopencm3/stm32/iwdg.h similarity index 98% rename from include/libopencm3/stm32_common/iwdg.h rename to include/libopencm3/stm32/iwdg.h index 67f29610..bf2784ab 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 +#include #include /* --- IWDG registers ------------------------------------------------------ */ diff --git a/include/libopencm3/stm32_common/memorymap.h b/include/libopencm3/stm32/memorymap.h similarity index 96% rename from include/libopencm3/stm32_common/memorymap.h rename to include/libopencm3/stm32/memorymap.h index 0d0c60fb..17a919ef 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 - #ifdef STM32F1 #include #else diff --git a/include/libopencm3/stm32_common/pwr.h b/include/libopencm3/stm32/pwr.h similarity index 97% rename from include/libopencm3/stm32_common/pwr.h rename to include/libopencm3/stm32/pwr.h index 4af84804..e5b98042 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 +#include #include /* --- PWR registers ------------------------------------------------------- */ diff --git a/include/libopencm3/stm32_common/spi.h b/include/libopencm3/stm32/spi.h similarity index 99% rename from include/libopencm3/stm32_common/spi.h rename to include/libopencm3/stm32/spi.h index 32494570..3cadaf8c 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 +#include #include /* Registers can be accessed as 16bit or 32bit values. */ diff --git a/include/libopencm3/stm32_common/timer.h b/include/libopencm3/stm32/timer.h similarity index 99% rename from include/libopencm3/stm32_common/timer.h rename to include/libopencm3/stm32/timer.h index c1eac99a..7b5df860 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 +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopencm3/stm32_common/usart.h b/include/libopencm3/stm32/usart.h similarity index 99% rename from include/libopencm3/stm32_common/usart.h rename to include/libopencm3/stm32/usart.h index 0a1ed363..df6bc089 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 +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopencm3/stm32_common/wwdg.h b/include/libopencm3/stm32/wwdg.h similarity index 97% rename from include/libopencm3/stm32_common/wwdg.h rename to include/libopencm3/stm32/wwdg.h index e1787c86..552d02ed 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 +#include #include /* --- WWDG registers ------------------------------------------------------ */