diff options
| author | Ken Sarkies <ksarkies@internode.on.net> | 2014-02-21 02:34:19 +0400 |
|---|---|---|
| committer | Karl Palsson <karlp@remake.is> | 2014-03-11 20:40:31 +0400 |
| commit | 7816501dbc8d57e2c186964f548fa5e90af13bbd (patch) | |
| tree | f7489c4fdc7e6be8f259662d00aa20c0fe607de0 /include/libopencm3 | |
| parent | 0f29fc8b1be14db4908ee1d377c5e571d0ca6235 (diff) | |
Changes to the header includes for all STM32 peripherals
to remove variations, redundancies, add missing, fix errors. All c files
refer only to the dispatch style headers in /include/stm32. Those headers
#include memorymap.h and cm3/common.h. All references to
these are removed from the family specific headers. Ethernet untouched as
it appears incomplete.
Added dummy spi.c for F0/F3. Fix some doxygen anomalies.
Diffstat (limited to 'include/libopencm3')
156 files changed, 108 insertions, 218 deletions
diff --git a/include/libopencm3/stm32/adc.h b/include/libopencm3/stm32/adc.h index fa248941..54388be8 100644 --- a/include/libopencm3/stm32/adc.h +++ b/include/libopencm3/stm32/adc.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/adc.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/cec.h b/include/libopencm3/stm32/cec.h index 73d1a230..e2a040b2 100644 --- a/include/libopencm3/stm32/cec.h +++ b/include/libopencm3/stm32/cec.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/cec.h> #else diff --git a/include/libopencm3/stm32/common/adc_common_v1.h b/include/libopencm3/stm32/common/adc_common_v1.h index 134b235b..ed0cc360 100644 --- a/include/libopencm3/stm32/common/adc_common_v1.h +++ b/include/libopencm3/stm32/common/adc_common_v1.h @@ -35,8 +35,6 @@ specific memorymap.h header before including this header file.*/ #ifndef LIBOPENCM3_ADC_COMMON_V1_H #define LIBOPENCM3_ADC_COMMON_V1_H -#include <libopencm3/cm3/common.h> - /* --- Convenience macros -------------------------------------------------- */ /* ADC port base addresses (for convenience) */ diff --git a/include/libopencm3/stm32/common/crc_common_all.h b/include/libopencm3/stm32/common/crc_common_all.h index 7dfeca52..4d16c203 100644 --- a/include/libopencm3/stm32/common/crc_common_all.h +++ b/include/libopencm3/stm32/common/crc_common_all.h @@ -35,8 +35,6 @@ specific memorymap.h header before including this header file.*/ /**@{*/ -#include <libopencm3/cm3/common.h> - /*****************************************************************************/ /* Module definitions */ /*****************************************************************************/ diff --git a/include/libopencm3/stm32/common/crypto_common_f24.h b/include/libopencm3/stm32/common/crypto_common_f24.h index 592edec2..eb885c8f 100644 --- a/include/libopencm3/stm32/common/crypto_common_f24.h +++ b/include/libopencm3/stm32/common/crypto_common_f24.h @@ -100,8 +100,6 @@ specific memorymap.h header before including this header file.*/ #ifndef LIBOPENCM3_CRYPTO_COMMON_F24_H #define LIBOPENCM3_CRYPTO_COMMON_F24_H -#include <libopencm3/cm3/common.h> - /**@{*/ /* --- CRYP registers ------------------------------------------------------ */ diff --git a/include/libopencm3/stm32/common/dac_common_all.h b/include/libopencm3/stm32/common/dac_common_all.h index adeb0bc8..7a241ab8 100644 --- a/include/libopencm3/stm32/common/dac_common_all.h +++ b/include/libopencm3/stm32/common/dac_common_all.h @@ -36,9 +36,6 @@ specific memorymap.h header before including this header file.*/ #ifndef LIBOPENCM3_DAC_COMMON_ALL_H #define LIBOPENCM3_DAC_COMMON_ALL_H -#include <libopencm3/cm3/common.h> - - /* --- DAC registers ------------------------------------------------------- */ /* DAC control register (DAC_CR) */ diff --git a/include/libopencm3/stm32/common/dma_common_f24.h b/include/libopencm3/stm32/common/dma_common_f24.h index a91f4a6b..922a8b3a 100644 --- a/include/libopencm3/stm32/common/dma_common_f24.h +++ b/include/libopencm3/stm32/common/dma_common_f24.h @@ -38,8 +38,6 @@ specific memorymap.h header before including this header file.*/ /**@{*/ -#include <libopencm3/cm3/common.h> - /* --- Convenience macros -------------------------------------------------- */ /* DMA controller base addresses (for convenience) */ diff --git a/include/libopencm3/stm32/common/dma_common_l1f013.h b/include/libopencm3/stm32/common/dma_common_l1f013.h index ce329fbb..cb781a4c 100644 --- a/include/libopencm3/stm32/common/dma_common_l1f013.h +++ b/include/libopencm3/stm32/common/dma_common_l1f013.h @@ -39,8 +39,6 @@ specific memorymap.h header before including this header file.*/ #ifndef LIBOPENCM3_DMA_COMMON_F13_H #define LIBOPENCM3_DMA_COMMON_F13_H -#include <libopencm3/cm3/common.h> - /* --- Convenience macros -------------------------------------------------- */ /* DMA register base adresses (for convenience) */ diff --git a/include/libopencm3/stm32/common/exti_common_all.h b/include/libopencm3/stm32/common/exti_common_all.h index 33be9fdf..317c2670 100644 --- a/include/libopencm3/stm32/common/exti_common_all.h +++ b/include/libopencm3/stm32/common/exti_common_all.h @@ -29,9 +29,6 @@ #define LIBOPENCM3_EXTI_COMMON_ALL_H /**@{*/ -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /* --- EXTI registers ------------------------------------------------------ */ #define EXTI_IMR MMIO32(EXTI_BASE + 0x00) diff --git a/include/libopencm3/stm32/common/exti_common_l1f24.h b/include/libopencm3/stm32/common/exti_common_l1f24.h index d01848a5..60f5c1b3 100644 --- a/include/libopencm3/stm32/common/exti_common_l1f24.h +++ b/include/libopencm3/stm32/common/exti_common_l1f24.h @@ -29,8 +29,6 @@ #define LIBOPENCM3_EXTI_COMMON_F24_H /**@{*/ -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> #include <libopencm3/stm32/common/exti_common_all.h> /* EXTI number definitions */ diff --git a/include/libopencm3/stm32/common/flash_common_f01.h b/include/libopencm3/stm32/common/flash_common_f01.h index 04b59418..e765c3bd 100644 --- a/include/libopencm3/stm32/common/flash_common_f01.h +++ b/include/libopencm3/stm32/common/flash_common_f01.h @@ -35,7 +35,6 @@ #define LIBOPENCM3_FLASH_COMMON_F01_H /**@{*/ -#include <libopencm3/cm3/common.h> /* --- FLASH registers ----------------------------------------------------- */ #define FLASH_ACR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x00) diff --git a/include/libopencm3/stm32/common/flash_common_f234.h b/include/libopencm3/stm32/common/flash_common_f234.h index 99ac9aee..a012cf6e 100644 --- a/include/libopencm3/stm32/common/flash_common_f234.h +++ b/include/libopencm3/stm32/common/flash_common_f234.h @@ -40,8 +40,6 @@ #define LIBOPENCM3_FLASH_COMMON_F234_H /**@{*/ -#include <libopencm3/cm3/common.h> - /* --- FLASH registers ----------------------------------------------------- */ #define FLASH_ACR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x00) diff --git a/include/libopencm3/stm32/common/flash_common_f24.h b/include/libopencm3/stm32/common/flash_common_f24.h index 932f1a8b..b47329c7 100644 --- a/include/libopencm3/stm32/common/flash_common_f24.h +++ b/include/libopencm3/stm32/common/flash_common_f24.h @@ -40,7 +40,6 @@ #define LIBOPENCM3_FLASH_COMMON_F24_H /**@{*/ -#include <libopencm3/cm3/common.h> #include <libopencm3/stm32/common/flash_common_f234.h> /* --- FLASH registers ----------------------------------------------------- */ diff --git a/include/libopencm3/stm32/common/gpio_common_all.h b/include/libopencm3/stm32/common/gpio_common_all.h index 99145e94..fcfd31e1 100644 --- a/include/libopencm3/stm32/common/gpio_common_all.h +++ b/include/libopencm3/stm32/common/gpio_common_all.h @@ -38,8 +38,6 @@ specific memorymap.h header before including this header file.*/ /**@{*/ -#include <libopencm3/cm3/common.h> - /* --- Convenience macros -------------------------------------------------- */ /* --- GPIO_LCKR values ---------------------------------------------------- */ diff --git a/include/libopencm3/stm32/common/gpio_common_f24.h b/include/libopencm3/stm32/common/gpio_common_f24.h index 21b6b8ae..69e18c70 100644 --- a/include/libopencm3/stm32/common/gpio_common_f24.h +++ b/include/libopencm3/stm32/common/gpio_common_f24.h @@ -38,7 +38,6 @@ specific memorymap.h header before including this header file.*/ /**@{*/ -#include <libopencm3/stm32/common/gpio_common_all.h> #include <libopencm3/stm32/common/gpio_common_f234.h> /* GPIO port base addresses (for convenience) */ diff --git a/include/libopencm3/stm32/common/hash_common_f24.h b/include/libopencm3/stm32/common/hash_common_f24.h index f7ea91f6..6c433028 100644 --- a/include/libopencm3/stm32/common/hash_common_f24.h +++ b/include/libopencm3/stm32/common/hash_common_f24.h @@ -31,8 +31,6 @@ #ifndef LIBOPENCM3_HASH_COMMON_F24_H #define LIBOPENCM3_HASH_COMMON_F24_H -#include <libopencm3/cm3/common.h> - /* --- Convenience macros -------------------------------------------------- */ /****************************************************************************/ diff --git a/include/libopencm3/stm32/common/i2c_common_all.h b/include/libopencm3/stm32/common/i2c_common_all.h index 81f81b8c..0d8546c7 100644 --- a/include/libopencm3/stm32/common/i2c_common_all.h +++ b/include/libopencm3/stm32/common/i2c_common_all.h @@ -32,8 +32,6 @@ specific memorymap.h header before including this header file.*/ #ifndef LIBOPENCM3_I2C_COMMON_ALL_H #define LIBOPENCM3_I2C_COMMON_ALL_H -#include <libopencm3/cm3/common.h> - /**@{*/ /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopencm3/stm32/common/iwdg_common_all.h b/include/libopencm3/stm32/common/iwdg_common_all.h index ae8010f0..7d915d69 100644 --- a/include/libopencm3/stm32/common/iwdg_common_all.h +++ b/include/libopencm3/stm32/common/iwdg_common_all.h @@ -32,8 +32,6 @@ specific memorymap.h header before including this header file.*/ #ifndef LIBOPENCM3_IWDG_COMMON_ALL_H #define LIBOPENCM3_IWDG_COMMON_ALL_H -#include <libopencm3/cm3/common.h> - /**@{*/ /* --- IWDG registers ------------------------------------------------------ */ diff --git a/include/libopencm3/stm32/common/pwr_common_all.h b/include/libopencm3/stm32/common/pwr_common_all.h index 22be437a..56d2fe11 100644 --- a/include/libopencm3/stm32/common/pwr_common_all.h +++ b/include/libopencm3/stm32/common/pwr_common_all.h @@ -35,8 +35,6 @@ specific memorymap.h header before including this header file.*/ /**@{*/ -#include <libopencm3/cm3/common.h> - /* --- PWR registers ------------------------------------------------------- */ /* Power control register (PWR_CR) */ diff --git a/include/libopencm3/stm32/common/rcc_common_all.h b/include/libopencm3/stm32/common/rcc_common_all.h index b6cb08e1..68511f1f 100644 --- a/include/libopencm3/stm32/common/rcc_common_all.h +++ b/include/libopencm3/stm32/common/rcc_common_all.h @@ -33,6 +33,7 @@ #ifndef LIBOPENCM3_RCC_COMMON_ALL_H #define LIBOPENCM3_RCC_COMMON_ALL_H + /**@{*/ BEGIN_DECLS diff --git a/include/libopencm3/stm32/common/rng_common_f24.h b/include/libopencm3/stm32/common/rng_common_f24.h index d739f59c..fc029af6 100644 --- a/include/libopencm3/stm32/common/rng_common_f24.h +++ b/include/libopencm3/stm32/common/rng_common_f24.h @@ -26,9 +26,6 @@ specific memorymap.h header before including this header file.*/ #ifndef LIBOPENCM3_RNG_COMMON_F24_H #define LIBOPENCM3_RNG_COMMON_F24_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /* --- Random number generator registers ----------------------------------- */ /* Control register */ diff --git a/include/libopencm3/stm32/common/rtc_common_l1f024.h b/include/libopencm3/stm32/common/rtc_common_l1f024.h index 181ad5be..677caf0b 100644 --- a/include/libopencm3/stm32/common/rtc_common_l1f024.h +++ b/include/libopencm3/stm32/common/rtc_common_l1f024.h @@ -42,9 +42,6 @@ specific memorymap.h header before including this header file.*/ /**@{*/ -#include <libopencm3/cm3/common.h> -#include <libopencm3/stm32/memorymap.h> - /* RTC time register (RTC_TR) */ #define RTC_TR MMIO32(RTC_BASE + 0x00) diff --git a/include/libopencm3/stm32/common/spi_common_all.h b/include/libopencm3/stm32/common/spi_common_all.h index f27318d5..a0d25718 100644 --- a/include/libopencm3/stm32/common/spi_common_all.h +++ b/include/libopencm3/stm32/common/spi_common_all.h @@ -32,8 +32,6 @@ specific memorymap.h header before including this header file.*/ #ifndef LIBOPENCM3_SPI_COMMON_ALL_H #define LIBOPENCM3_SPI_COMMON_ALL_H -#include <libopencm3/cm3/common.h> - /**@{*/ /* Registers can be accessed as 16bit or 32bit values. */ diff --git a/include/libopencm3/stm32/common/syscfg_common_l1f234.h b/include/libopencm3/stm32/common/syscfg_common_l1f234.h index 80393306..2b41c95c 100644 --- a/include/libopencm3/stm32/common/syscfg_common_l1f234.h +++ b/include/libopencm3/stm32/common/syscfg_common_l1f234.h @@ -34,8 +34,6 @@ specific memorymap.h header before including this header file.*/ #define LIBOPENCM3_SYSCFG_COMMON_L1F234_H /**@{*/ -#include <libopencm3/stm32/memorymap.h> - /* --- SYSCFG registers ---------------------------------------------------- */ diff --git a/include/libopencm3/stm32/common/timer_common_all.h b/include/libopencm3/stm32/common/timer_common_all.h index 7eea4ae8..bd526b4b 100644 --- a/include/libopencm3/stm32/common/timer_common_all.h +++ b/include/libopencm3/stm32/common/timer_common_all.h @@ -34,9 +34,6 @@ specific memorymap.h header before including this header file.*/ #ifndef LIBOPENCM3_TIMER_COMMON_H #define LIBOPENCM3_TIMER_COMMON_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /* --- Convenience macros -------------------------------------------------- */ /* Timer register base addresses (for convenience) */ diff --git a/include/libopencm3/stm32/common/usart_common_all.h b/include/libopencm3/stm32/common/usart_common_all.h index adab105f..6eafdfdd 100644 --- a/include/libopencm3/stm32/common/usart_common_all.h +++ b/include/libopencm3/stm32/common/usart_common_all.h @@ -34,8 +34,6 @@ specific memorymap.h header before including this header file.*/ #ifndef LIBOPENCM3_USART_COMMON_ALL_H #define LIBOPENCM3_USART_COMMON_ALL_H -#include <libopencm3/cm3/common.h> - /* --- Convenience macros -------------------------------------------------- */ /****************************************************************************/ diff --git a/include/libopencm3/stm32/common/usart_common_f124.h b/include/libopencm3/stm32/common/usart_common_f124.h index 169f6936..0bb85148 100644 --- a/include/libopencm3/stm32/common/usart_common_f124.h +++ b/include/libopencm3/stm32/common/usart_common_f124.h @@ -35,7 +35,6 @@ specific memorymap.h header before including this header file.*/ #ifndef LIBOPENCM3_USART_COMMON_F124_H #define LIBOPENCM3_USART_COMMON_F124_H -#include <libopencm3/cm3/common.h> #include <libopencm3/stm32/common/usart_common_all.h> /* --- USART registers ----------------------------------------------------- */ diff --git a/include/libopencm3/stm32/comparator.h b/include/libopencm3/stm32/comparator.h index c1e49a94..b372e222 100644 --- a/include/libopencm3/stm32/comparator.h +++ b/include/libopencm3/stm32/comparator.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/comparator.h> #else diff --git a/include/libopencm3/stm32/crc.h b/include/libopencm3/stm32/crc.h index a75546ef..469124fc 100644 --- a/include/libopencm3/stm32/crc.h +++ b/include/libopencm3/stm32/crc.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/crc.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/crs.h b/include/libopencm3/stm32/crs.h index 4ab1e25b..d75a624a 100644 --- a/include/libopencm3/stm32/crs.h +++ b/include/libopencm3/stm32/crs.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/crs.h> #else diff --git a/include/libopencm3/stm32/crypto.h b/include/libopencm3/stm32/crypto.h index 419668e9..575032df 100644 --- a/include/libopencm3/stm32/crypto.h +++ b/include/libopencm3/stm32/crypto.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F2) # include <libopencm3/stm32/f2/crypto.h> #elif defined(STM32F4) diff --git a/include/libopencm3/stm32/dac.h b/include/libopencm3/stm32/dac.h index cc01927c..0e186052 100644 --- a/include/libopencm3/stm32/dac.h +++ b/include/libopencm3/stm32/dac.h @@ -16,6 +16,10 @@ * You should have received a copy of the GNU Lesser General Public License * along with this library. If not, see <http://www.gnu.org/licenses/>. */ + +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/dac.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/dbgmcu.h b/include/libopencm3/stm32/dbgmcu.h index b26b6b9f..cb4c5f69 100644 --- a/include/libopencm3/stm32/dbgmcu.h +++ b/include/libopencm3/stm32/dbgmcu.h @@ -20,8 +20,8 @@ #ifndef LIBOPENCM3_STM32_DBGMCU_H #define LIBOPENCM3_STM32_DBGMCU_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> /* --- DBGMCU registers ---------------------------------------------------- */ diff --git a/include/libopencm3/stm32/desig.h b/include/libopencm3/stm32/desig.h index c7f3f65e..53d0cf33 100644 --- a/include/libopencm3/stm32/desig.h +++ b/include/libopencm3/stm32/desig.h @@ -20,8 +20,8 @@ #ifndef LIBOPENCM3_DESIG_H #define LIBOPENCM3_DESIG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> /* --- Device Electronic Signature -------------------------------- */ diff --git a/include/libopencm3/stm32/dma.h b/include/libopencm3/stm32/dma.h index 7310141c..dd2880be 100644 --- a/include/libopencm3/stm32/dma.h +++ b/include/libopencm3/stm32/dma.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/dma.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/exti.h b/include/libopencm3/stm32/exti.h index b9c172c2..96cf771b 100644 --- a/include/libopencm3/stm32/exti.h +++ b/include/libopencm3/stm32/exti.h @@ -19,6 +19,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/exti.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/f0/adc.h b/include/libopencm3/stm32/f0/adc.h index 9fc4b4b6..c76fefbc 100644 --- a/include/libopencm3/stm32/f0/adc.h +++ b/include/libopencm3/stm32/f0/adc.h @@ -33,9 +33,6 @@ #ifndef LIBOPENCM3_ADC_H #define LIBOPENCM3_ADC_H -#include <libopencm3/cm3/common.h> -#include <libopencm3/stm32/memorymap.h> - /*****************************************************************************/ /* Module definitions */ /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/cec.h b/include/libopencm3/stm32/f0/cec.h index 687e1dd5..2193a97e 100644 --- a/include/libopencm3/stm32/f0/cec.h +++ b/include/libopencm3/stm32/f0/cec.h @@ -33,9 +33,6 @@ #define LIBOPENCM3_CEC_H /**@{*/ -#include <libopencm3/cm3/common.h> -#include <libopencm3/stm32/memorymap.h> - /*****************************************************************************/ /* Module definitions */ /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/comparator.h b/include/libopencm3/stm32/f0/comparator.h index 14111710..78db9cf9 100644 --- a/include/libopencm3/stm32/f0/comparator.h +++ b/include/libopencm3/stm32/f0/comparator.h @@ -34,9 +34,6 @@ #define LIBOPENCM3_COMP_H /**@{*/ -#include <libopencm3/cm3/common.h> -#include <libopencm3/stm32/memorymap.h> - /*****************************************************************************/ /* Module definitions */ /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/crc.h b/include/libopencm3/stm32/f0/crc.h index efa1380c..34d8a897 100644 --- a/include/libopencm3/stm32/f0/crc.h +++ b/include/libopencm3/stm32/f0/crc.h @@ -34,7 +34,6 @@ #define LIBOPENCM3_CRC_H /**@{*/ -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/crc_common_all.h> /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/crs.h b/include/libopencm3/stm32/f0/crs.h index 9a56529b..b65610ca 100644 --- a/include/libopencm3/stm32/f0/crs.h +++ b/include/libopencm3/stm32/f0/crs.h @@ -33,9 +33,6 @@ #define LIBOPENCM3_CRS_H /**@{*/ -#include <libopencm3/cm3/common.h> -#include <libopencm3/stm32/memorymap.h> - /*****************************************************************************/ /* Module definitions */ /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/dac.h b/include/libopencm3/stm32/f0/dac.h index 377ee5d2..7f544843 100644 --- a/include/libopencm3/stm32/f0/dac.h +++ b/include/libopencm3/stm32/f0/dac.h @@ -33,8 +33,7 @@ #ifndef LIBOPENCM3_DAC_H #define LIBOPENCM3_DAC_H -#include <libopencm3/cm3/common.h> -#include <libopencm3/stm32/memorymap.h> +#include <libopencm3/stm32/common/dac_common_all.h> /*****************************************************************************/ /* Module definitions */ diff --git a/include/libopencm3/stm32/f0/dma.h b/include/libopencm3/stm32/f0/dma.h index 37be251b..42b4687d 100644 --- a/include/libopencm3/stm32/f0/dma.h +++ b/include/libopencm3/stm32/f0/dma.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_DMA_H #define LIBOPENCM3_DMA_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/dma_common_l1f013.h> #endif diff --git a/include/libopencm3/stm32/f0/exti.h b/include/libopencm3/stm32/f0/exti.h index 436c0f71..3a99f5bb 100644 --- a/include/libopencm3/stm32/f0/exti.h +++ b/include/libopencm3/stm32/f0/exti.h @@ -34,7 +34,6 @@ #define LIBOPENCM3_EXTI_H /**@{*/ -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/exti_common_all.h> /**@}*/ diff --git a/include/libopencm3/stm32/f0/flash.h b/include/libopencm3/stm32/f0/flash.h index 70ff12dd..58e9ea6e 100644 --- a/include/libopencm3/stm32/f0/flash.h +++ b/include/libopencm3/stm32/f0/flash.h @@ -36,7 +36,6 @@ #define LIBOPENCM3_FLASH_H /**@{*/ -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/flash_common_f01.h> /* --- FLASH_OPTION values ------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f0/gpio.h b/include/libopencm3/stm32/f0/gpio.h index 5a33ecd3..cfef3582 100644 --- a/include/libopencm3/stm32/f0/gpio.h +++ b/include/libopencm3/stm32/f0/gpio.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_GPIO_H #define LIBOPENCM3_GPIO_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/gpio_common_f24.h> /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/i2c.h b/include/libopencm3/stm32/f0/i2c.h index 82adece4..06ff2dd9 100644 --- a/include/libopencm3/stm32/f0/i2c.h +++ b/include/libopencm3/stm32/f0/i2c.h @@ -32,8 +32,6 @@ #ifndef LIBOPENCM3_I2C_H #define LIBOPENCM3_I2C_H -#include <libopencm3/cm3/common.h> - /*****************************************************************************/ /* Module definitions */ /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/iwdg.h b/include/libopencm3/stm32/f0/iwdg.h index 7ac90927..be9dc5ab 100644 --- a/include/libopencm3/stm32/f0/iwdg.h +++ b/include/libopencm3/stm32/f0/iwdg.h @@ -33,7 +33,6 @@ #ifndef LIBOPENCM3_IWDG_H #define LIBOPENCM3_IWDG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/iwdg_common_all.h> /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/pwr.h b/include/libopencm3/stm32/f0/pwr.h index e530059d..e0706b63 100644 --- a/include/libopencm3/stm32/f0/pwr.h +++ b/include/libopencm3/stm32/f0/pwr.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/pwr_common_all.h> /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/rcc.h b/include/libopencm3/stm32/f0/rcc.h index 6fbcc92a..39de15e7 100644 --- a/include/libopencm3/stm32/f0/rcc.h +++ b/include/libopencm3/stm32/f0/rcc.h @@ -37,9 +37,6 @@ Control</b> #ifndef LIBOPENCM3_RCC_H #define LIBOPENCM3_RCC_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /*****************************************************************************/ /* Module definitions */ /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/rtc.h b/include/libopencm3/stm32/f0/rtc.h index 79b08508..8a99c241 100644 --- a/include/libopencm3/stm32/f0/rtc.h +++ b/include/libopencm3/stm32/f0/rtc.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_RTC_H #define LIBOPENCM3_RTC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/rtc_common_l1f024.h> #endif diff --git a/include/libopencm3/stm32/f0/spi.h b/include/libopencm3/stm32/f0/spi.h index bbd9da40..773743eb 100644 --- a/include/libopencm3/stm32/f0/spi.h +++ b/include/libopencm3/stm32/f0/spi.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_SPI_H #define LIBOPENCM3_SPI_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/spi_common_f03.h> #endif diff --git a/include/libopencm3/stm32/f0/syscfg.h b/include/libopencm3/stm32/f0/syscfg.h index ba6ff6f5..10845437 100644 --- a/include/libopencm3/stm32/f0/syscfg.h +++ b/include/libopencm3/stm32/f0/syscfg.h @@ -36,9 +36,6 @@ #define LIBOPENCM3_SYSCFG_H /**@{*/ -#include <libopencm3/cm3/common.h> -#include <libopencm3/stm32/memorymap.h> - /*****************************************************************************/ /* Module definitions */ /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/timer.h b/include/libopencm3/stm32/f0/timer.h index 988b4fe4..cbcc9846 100644 --- a/include/libopencm3/stm32/f0/timer.h +++ b/include/libopencm3/stm32/f0/timer.h @@ -29,4 +29,7 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef LIBOPENCM3_TIMER_H +#define LIBOPENCM3_TIMER_H +#endif diff --git a/include/libopencm3/stm32/f0/tsc.h b/include/libopencm3/stm32/f0/tsc.h index 189cb81f..fbd65b4b 100644 --- a/include/libopencm3/stm32/f0/tsc.h +++ b/include/libopencm3/stm32/f0/tsc.h @@ -33,9 +33,6 @@ #define LIBOPENCM3_TSC_H /**@{*/ -#include <libopencm3/cm3/common.h> -#include <libopencm3/stm32/memorymap.h> - /*****************************************************************************/ /* Module definitions */ /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f0/usart.h b/include/libopencm3/stm32/f0/usart.h index c54e551f..8dba6833 100644 --- a/include/libopencm3/stm32/f0/usart.h +++ b/include/libopencm3/stm32/f0/usart.h @@ -31,9 +31,6 @@ #ifndef LIBOPENCM3_USART_H #define LIBOPENCM3_USART_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /*****************************************************************************/ /* Module definitions */ /*****************************************************************************/ diff --git a/include/libopencm3/stm32/f1/adc.h b/include/libopencm3/stm32/f1/adc.h index 543b8916..ec7cabc0 100644 --- a/include/libopencm3/stm32/f1/adc.h +++ b/include/libopencm3/stm32/f1/adc.h @@ -38,8 +38,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_ADC_H #define LIBOPENCM3_ADC_H -#include <libopencm3/cm3/common.h> -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/adc_common_v1.h> /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f1/bkp.h b/include/libopencm3/stm32/f1/bkp.h index b488451f..3d36a1f4 100644 --- a/include/libopencm3/stm32/f1/bkp.h +++ b/include/libopencm3/stm32/f1/bkp.h @@ -20,9 +20,6 @@ #ifndef LIBOPENCM3_BKP_H #define LIBOPENCM3_BKP_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /* --- BKP registers ------------------------------------------------------- */ /* Backup data register 1 (BKP_DR1) */ diff --git a/include/libopencm3/stm32/f1/crc.h b/include/libopencm3/stm32/f1/crc.h index aed01280..a35bf490 100644 --- a/include/libopencm3/stm32/f1/crc.h +++ b/include/libopencm3/stm32/f1/crc.h @@ -33,7 +33,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_CRC_H #define LIBOPENCM3_CRC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/crc_common_all.h> #endif diff --git a/include/libopencm3/stm32/f1/dac.h b/include/libopencm3/stm32/f1/dac.h index e68618b8..145df731 100644 --- a/include/libopencm3/stm32/f1/dac.h +++ b/include/libopencm3/stm32/f1/dac.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_DAC_H #define LIBOPENCM3_DAC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/dac_common_all.h> #endif diff --git a/include/libopencm3/stm32/f1/dma.h b/include/libopencm3/stm32/f1/dma.h index 5e259955..ac730904 100644 --- a/include/libopencm3/stm32/f1/dma.h +++ b/include/libopencm3/stm32/f1/dma.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_DMA_H #define LIBOPENCM3_DMA_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/dma_common_l1f013.h> #endif diff --git a/include/libopencm3/stm32/f1/ethernet.h b/include/libopencm3/stm32/f1/ethernet.h index a20c6bb0..5598cce0 100644 --- a/include/libopencm3/stm32/f1/ethernet.h +++ b/include/libopencm3/stm32/f1/ethernet.h @@ -17,12 +17,12 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #ifndef LIBOPENCM3_ETHERNET_H #define LIBOPENCM3_ETHERNET_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /* Ethernet MAC registers */ #define ETH_MACCR MMIO32(ETHERNET_BASE + 0x00) #define ETH_MACFFR MMIO32(ETHERNET_BASE + 0x04) diff --git a/include/libopencm3/stm32/f1/exti.h b/include/libopencm3/stm32/f1/exti.h index 8f1ec090..10882107 100644 --- a/include/libopencm3/stm32/f1/exti.h +++ b/include/libopencm3/stm32/f1/exti.h @@ -36,7 +36,6 @@ #ifndef LIBOPENCM3_EXTI_H #define LIBOPENCM3_EXTI_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/exti_common_all.h> #endif diff --git a/include/libopencm3/stm32/f1/flash.h b/include/libopencm3/stm32/f1/flash.h index 8192730b..f7ba402b 100644 --- a/include/libopencm3/stm32/f1/flash.h +++ b/include/libopencm3/stm32/f1/flash.h @@ -43,7 +43,6 @@ /**@{*/ -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/flash_common_f01.h> /* --- FLASH_OPTION bytes ------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f1/gpio.h b/include/libopencm3/stm32/f1/gpio.h index a411ba5f..9fc89900 100644 --- a/include/libopencm3/stm32/f1/gpio.h +++ b/include/libopencm3/stm32/f1/gpio.h @@ -36,7 +36,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_GPIO_H #define LIBOPENCM3_GPIO_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/gpio_common_all.h> /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f1/i2c.h b/include/libopencm3/stm32/f1/i2c.h index 8c6ab521..19c26a35 100644 --- a/include/libopencm3/stm32/f1/i2c.h +++ b/include/libopencm3/stm32/f1/i2c.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_I2C_H #define LIBOPENCM3_I2C_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/i2c_common_all.h> #endif diff --git a/include/libopencm3/stm32/f1/iwdg.h b/include/libopencm3/stm32/f1/iwdg.h index 8c5c0654..cdb51154 100644 --- a/include/libopencm3/stm32/f1/iwdg.h +++ b/include/libopencm3/stm32/f1/iwdg.h @@ -33,7 +33,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_IWDG_H #define LIBOPENCM3_IWDG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/iwdg_common_all.h> #endif diff --git a/include/libopencm3/stm32/f1/pwr.h b/include/libopencm3/stm32/f1/pwr.h index 1cabca3f..51b39775 100644 --- a/include/libopencm3/stm32/f1/pwr.h +++ b/include/libopencm3/stm32/f1/pwr.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/pwr_common_all.h> #endif diff --git a/include/libopencm3/stm32/f1/rcc.h b/include/libopencm3/stm32/f1/rcc.h index 35b49b38..41ae09e4 100644 --- a/include/libopencm3/stm32/f1/rcc.h +++ b/include/libopencm3/stm32/f1/rcc.h @@ -40,9 +40,6 @@ #ifndef LIBOPENCM3_RCC_H #define LIBOPENCM3_RCC_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /* Note: Regs/bits marked (**) only exist in "connectivity line" STM32s. */ /* Note: Regs/bits marked (XX) do NOT exist in "connectivity line" STM32s. */ diff --git a/include/libopencm3/stm32/f1/rtc.h b/include/libopencm3/stm32/f1/rtc.h index 713d5817..3a60fca6 100644 --- a/include/libopencm3/stm32/f1/rtc.h +++ b/include/libopencm3/stm32/f1/rtc.h @@ -40,10 +40,8 @@ #define LIBOPENCM3_RTC_H /**@{*/ -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> #include <libopencm3/stm32/pwr.h> -#include <libopencm3/stm32/f1/rcc.h> +#include <libopencm3/stm32/rcc.h> /* --- RTC registers ------------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f1/spi.h b/include/libopencm3/stm32/f1/spi.h index 1adb329b..8513454d 100644 --- a/include/libopencm3/stm32/f1/spi.h +++ b/include/libopencm3/stm32/f1/spi.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_SPI_H #define LIBOPENCM3_SPI_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/spi_common_l1f124.h> #endif diff --git a/include/libopencm3/stm32/f1/usart.h b/include/libopencm3/stm32/f1/usart.h index 5bd3f477..324d78eb 100644 --- a/include/libopencm3/stm32/f1/usart.h +++ b/include/libopencm3/stm32/f1/usart.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_USART_H #define LIBOPENCM3_USART_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/usart_common_f124.h> #endif diff --git a/include/libopencm3/stm32/f2/crc.h b/include/libopencm3/stm32/f2/crc.h index e9e5eae0..45c16ba6 100644 --- a/include/libopencm3/stm32/f2/crc.h +++ b/include/libopencm3/stm32/f2/crc.h @@ -33,7 +33,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_CRC_H #define LIBOPENCM3_CRC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/crc_common_all.h> #endif diff --git a/include/libopencm3/stm32/f2/crypto.h b/include/libopencm3/stm32/f2/crypto.h index f549310d..02ea8b58 100644 --- a/include/libopencm3/stm32/f2/crypto.h +++ b/include/libopencm3/stm32/f2/crypto.h @@ -31,8 +31,6 @@ #ifndef LIBOPENCM3_CRYPTO_H #define LIBOPENCM3_CRYPTO_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> #include <libopencm3/stm32/common/crypto_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f2/dac.h b/include/libopencm3/stm32/f2/dac.h index 326706c0..5d148a6d 100644 --- a/include/libopencm3/stm32/f2/dac.h +++ b/include/libopencm3/stm32/f2/dac.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_DAC_H #define LIBOPENCM3_DAC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/dac_common_all.h> #endif diff --git a/include/libopencm3/stm32/f2/dma.h b/include/libopencm3/stm32/f2/dma.h index 5396bde1..8fe846df 100644 --- a/include/libopencm3/stm32/f2/dma.h +++ b/include/libopencm3/stm32/f2/dma.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_DMA_H #define LIBOPENCM3_DMA_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/dma_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f2/exti.h b/include/libopencm3/stm32/f2/exti.h index f2b2f3fb..5caadf8f 100644 --- a/include/libopencm3/stm32/f2/exti.h +++ b/include/libopencm3/stm32/f2/exti.h @@ -36,7 +36,6 @@ #ifndef LIBOPENCM3_EXTI_H #define LIBOPENCM3_EXTI_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/exti_common_l1f24.h> #endif diff --git a/include/libopencm3/stm32/f2/flash.h b/include/libopencm3/stm32/f2/flash.h index 8f01bdff..70668028 100644 --- a/include/libopencm3/stm32/f2/flash.h +++ b/include/libopencm3/stm32/f2/flash.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_FLASH_H #define LIBOPENCM3_FLASH_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/flash_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f2/gpio.h b/include/libopencm3/stm32/f2/gpio.h index f9f000a3..fed93532 100644 --- a/include/libopencm3/stm32/f2/gpio.h +++ b/include/libopencm3/stm32/f2/gpio.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_GPIO_H #define LIBOPENCM3_GPIO_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/gpio_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f2/hash.h b/include/libopencm3/stm32/f2/hash.h index 1d3bbac3..9f9cea96 100644 --- a/include/libopencm3/stm32/f2/hash.h +++ b/include/libopencm3/stm32/f2/hash.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_HASH_H #define LIBOPENCM3_HASH_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/hash_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f2/i2c.h b/include/libopencm3/stm32/f2/i2c.h index 7cc4bc81..c1be84c5 100644 --- a/include/libopencm3/stm32/f2/i2c.h +++ b/include/libopencm3/stm32/f2/i2c.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_I2C_H #define LIBOPENCM3_I2C_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/i2c_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f2/iwdg.h b/include/libopencm3/stm32/f2/iwdg.h index fff3fbd6..23ccb101 100644 --- a/include/libopencm3/stm32/f2/iwdg.h +++ b/include/libopencm3/stm32/f2/iwdg.h @@ -33,7 +33,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_IWDG_H #define LIBOPENCM3_IWDG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/iwdg_common_all.h> #endif diff --git a/include/libopencm3/stm32/f2/pwr.h b/include/libopencm3/stm32/f2/pwr.h index 7c765056..f946f880 100644 --- a/include/libopencm3/stm32/f2/pwr.h +++ b/include/libopencm3/stm32/f2/pwr.h @@ -33,7 +33,7 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_PWR_F2_H #define LIBOPENCM3_PWR_F2_H -#include <libopencm3/stm32/pwr.h> +#include <libopencm3/stm32/common/pwr_common_all.h> /* * This file extends the common STM32 version with definitions only diff --git a/include/libopencm3/stm32/f2/rcc.h b/include/libopencm3/stm32/f2/rcc.h index 79e37301..17b05f9a 100644 --- a/include/libopencm3/stm32/f2/rcc.h +++ b/include/libopencm3/stm32/f2/rcc.h @@ -43,9 +43,6 @@ #ifndef LIBOPENCM3_RCC_H #define LIBOPENCM3_RCC_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /* --- RCC registers ------------------------------------------------------- */ #define RCC_CR MMIO32(RCC_BASE + 0x00) diff --git a/include/libopencm3/stm32/f2/rng.h b/include/libopencm3/stm32/f2/rng.h index 2dbd5f17..6c3def69 100644 --- a/include/libopencm3/stm32/f2/rng.h +++ b/include/libopencm3/stm32/f2/rng.h @@ -18,7 +18,6 @@ #ifndef LIBOPENCM3_RNG_H #define LIBOPENCM3_RNG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/rng_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f2/rtc.h b/include/libopencm3/stm32/f2/rtc.h index 84faae5d..bae06aca 100644 --- a/include/libopencm3/stm32/f2/rtc.h +++ b/include/libopencm3/stm32/f2/rtc.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_RTC_H #define LIBOPENCM3_RTC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/rtc_common_l1f024.h> #endif diff --git a/include/libopencm3/stm32/f2/spi.h b/include/libopencm3/stm32/f2/spi.h index 2c434288..c503eab5 100644 --- a/include/libopencm3/stm32/f2/spi.h +++ b/include/libopencm3/stm32/f2/spi.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_SPI_H #define LIBOPENCM3_SPI_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/spi_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f2/syscfg.h b/include/libopencm3/stm32/f2/syscfg.h index 7216f7c3..579e6d67 100644 --- a/include/libopencm3/stm32/f2/syscfg.h +++ b/include/libopencm3/stm32/f2/syscfg.h @@ -37,7 +37,6 @@ #ifndef LIBOPENCM3_SYSCFG_H #define LIBOPENCM3_SYSCFG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/syscfg_common_l1f234.h> #endif diff --git a/include/libopencm3/stm32/f2/usart.h b/include/libopencm3/stm32/f2/usart.h index 8a4b54c2..8d4485bf 100644 --- a/include/libopencm3/stm32/f2/usart.h +++ b/include/libopencm3/stm32/f2/usart.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_USART_H #define LIBOPENCM3_USART_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/usart_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f3/adc.h b/include/libopencm3/stm32/f3/adc.h index a623854b..89d59398 100644 --- a/include/libopencm3/stm32/f3/adc.h +++ b/include/libopencm3/stm32/f3/adc.h @@ -3,7 +3,7 @@ * @brief <b>Defined Constants and Types for the STM32F37x Analog to Digital * converter</b> * - * @ingroup STM32F37x_defines + * @ingroup STM32F3xx_defines * * @version 1.0.0 * @@ -34,9 +34,6 @@ #ifndef LIBOPENCM3_ADC_H #define LIBOPENCM3_ADC_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - #define ADC1 ADC1_BASE #define ADC2 ADC2_BASE #define ADC3 ADC3_BASE diff --git a/include/libopencm3/stm32/f3/crc.h b/include/libopencm3/stm32/f3/crc.h index 41359049..828832b0 100644 --- a/include/libopencm3/stm32/f3/crc.h +++ b/include/libopencm3/stm32/f3/crc.h @@ -32,7 +32,6 @@ #ifndef LIBOPENCM3_CRC_H #define LIBOPENCM3_CRC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/crc_common_all.h> /* --- CRC registers ------------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f3/dac.h b/include/libopencm3/stm32/f3/dac.h index 9bb8b160..aceea8c5 100644 --- a/include/libopencm3/stm32/f3/dac.h +++ b/include/libopencm3/stm32/f3/dac.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_DAC_H #define LIBOPENCM3_DAC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/dac_common_all.h> #endif diff --git a/include/libopencm3/stm32/f3/dma.h b/include/libopencm3/stm32/f3/dma.h index b1c02809..ae738ccc 100644 --- a/include/libopencm3/stm32/f3/dma.h +++ b/include/libopencm3/stm32/f3/dma.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_DMA_H #define LIBOPENCM3_DMA_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/dma_common_l1f013.h> #endif diff --git a/include/libopencm3/stm32/f3/exti.h b/include/libopencm3/stm32/f3/exti.h index 4cd5888e..d94916db 100644 --- a/include/libopencm3/stm32/f3/exti.h +++ b/include/libopencm3/stm32/f3/exti.h @@ -37,7 +37,6 @@ #define LIBOPENCM3_EXTI_H /**@{*/ -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/exti_common_all.h> /* --- EXTI registers ------------------------------------------------------ */ diff --git a/include/libopencm3/stm32/f3/flash.h b/include/libopencm3/stm32/f3/flash.h index 9133c4cc..58a8c9fd 100644 --- a/include/libopencm3/stm32/f3/flash.h +++ b/include/libopencm3/stm32/f3/flash.h @@ -32,7 +32,6 @@ #define LIBOPENCM3_FLASH_H /**@{*/ -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/flash_common_f234.h> /* --- FLASH registers ----------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f3/gpio.h b/include/libopencm3/stm32/f3/gpio.h index 4a88a33c..82aad6b2 100644 --- a/include/libopencm3/stm32/f3/gpio.h +++ b/include/libopencm3/stm32/f3/gpio.h @@ -32,7 +32,6 @@ #ifndef LIBOPENCM3_GPIO_H #define LIBOPENCM3_GPIO_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/gpio_common_f234.h> #endif diff --git a/include/libopencm3/stm32/f3/i2c.h b/include/libopencm3/stm32/f3/i2c.h index 90f263aa..a16ff959 100644 --- a/include/libopencm3/stm32/f3/i2c.h +++ b/include/libopencm3/stm32/f3/i2c.h @@ -31,9 +31,6 @@ #ifndef LIBOPENCM3_I2C_H #define LIBOPENCM3_I2C_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /**@{*/ /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f3/iwdg.h b/include/libopencm3/stm32/f3/iwdg.h index 226c0a2e..c7413a4e 100644 --- a/include/libopencm3/stm32/f3/iwdg.h +++ b/include/libopencm3/stm32/f3/iwdg.h @@ -33,7 +33,6 @@ #ifndef LIBOPENCM3_IWDG_H #define LIBOPENCM3_IWDG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/iwdg_common_all.h> /* --- IWDG registers ------------------------------------------------------ */ diff --git a/include/libopencm3/stm32/f3/pwr.h b/include/libopencm3/stm32/f3/pwr.h index 5b5b7d4c..e30acb9d 100644 --- a/include/libopencm3/stm32/f3/pwr.h +++ b/include/libopencm3/stm32/f3/pwr.h @@ -41,7 +41,7 @@ #ifndef LIBOPENCM3_PWR_F3_H #define LIBOPENCM3_PWR_F3_H -#include <libopencm3/stm32/pwr.h> +#include <libopencm3/stm32/common/pwr_common_all.h> /* --- PWR_CR values ------------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f3/rcc.h b/include/libopencm3/stm32/f3/rcc.h index ee9c9674..41caaa38 100644 --- a/include/libopencm3/stm32/f3/rcc.h +++ b/include/libopencm3/stm32/f3/rcc.h @@ -51,9 +51,6 @@ #ifndef LIBOPENCM3_RCC_H #define LIBOPENCM3_RCC_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /* --- RCC registers ------------------------------------------------------- */ #define RCC_CR MMIO32(RCC_BASE + 0x00) diff --git a/include/libopencm3/stm32/f3/rtc.h b/include/libopencm3/stm32/f3/rtc.h index 3945b623..b982496c 100644 --- a/include/libopencm3/stm32/f3/rtc.h +++ b/include/libopencm3/stm32/f3/rtc.h @@ -36,7 +36,6 @@ #define LIBOPENCM3_RTC_F3_H /**@{*/ -#include <libopencm3/stm32/rtc.h> #include <libopencm3/stm32/common/rtc_common_all.h> /**@}*/ diff --git a/include/libopencm3/stm32/f3/spi.h b/include/libopencm3/stm32/f3/spi.h index 5abbb970..ad48fdaa 100644 --- a/include/libopencm3/stm32/f3/spi.h +++ b/include/libopencm3/stm32/f3/spi.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_SPI_H #define LIBOPENCM3_SPI_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/spi_common_f03.h> #endif diff --git a/include/libopencm3/stm32/f3/syscfg.h b/include/libopencm3/stm32/f3/syscfg.h index d559206b..39733da7 100644 --- a/include/libopencm3/stm32/f3/syscfg.h +++ b/include/libopencm3/stm32/f3/syscfg.h @@ -36,7 +36,6 @@ #ifndef LIBOPENCM3_SYSCFG_H #define LIBOPENCM3_SYSCFG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/syscfg_common_l1f234.h> #endif diff --git a/include/libopencm3/stm32/f3/usart.h b/include/libopencm3/stm32/f3/usart.h index 76089632..11111223 100644 --- a/include/libopencm3/stm32/f3/usart.h +++ b/include/libopencm3/stm32/f3/usart.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_USART_H #define LIBOPENCM3_USART_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/usart_common_all.h> /* --- USART registers ----------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f4/adc.h b/include/libopencm3/stm32/f4/adc.h index 63233190..56188f40 100644 --- a/include/libopencm3/stm32/f4/adc.h +++ b/include/libopencm3/stm32/f4/adc.h @@ -1,4 +1,4 @@ -/** @defgroup STM32F4xx_adc_defines ADC Defines +/** @defgroup adc_defines ADC Defines @brief <b>Defined Constants and Types for the STM32F4xx Analog to Digital Converters</b> @@ -39,8 +39,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_ADC_H #define LIBOPENCM3_ADC_H -#include <libopencm3/cm3/common.h> -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/adc_common_v1.h> /* --- Convenience macros -------------------------------------------------- */ @@ -104,7 +102,7 @@ LGPL License Terms @ref lgpl_license /* RES[1:0]: Resolution */ /****************************************************************************/ /** @defgroup adc_cr1_res ADC Resolution. -@ingroup STM32F4xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_CR1_RES_12BIT (0x0 << 24) @@ -129,7 +127,7 @@ LGPL License Terms @ref lgpl_license /* EXTEN[1:0]: External trigger enable for regular channels. */ /****************************************************************************/ /** @defgroup adc_trigger_polarity_regular ADC Trigger Polarity -@ingroup STM32F4xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_CR2_EXTEN_DISABLED (0x0 << 28) @@ -143,7 +141,7 @@ LGPL License Terms @ref lgpl_license /* EXTSEL[3:0]: External event selection for regular group. */ /****************************************************************************/ /** @defgroup adc_trigger_regular ADC Trigger Identifier for Regular group -@ingroup STM32F4xx_adc_defines +@ingroup adc_defines @{*/ /** Timer 1 Compare Output 1 */ @@ -190,7 +188,7 @@ LGPL License Terms @ref lgpl_license /* JEXTEN[1:0]: External trigger enable for injected channels. */ /****************************************************************************/ /** @defgroup adc_trigger_polarity_injected ADC Injected Trigger Polarity -@ingroup STM32F4xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_CR2_JEXTEN_DISABLED (0x0 << 20) @@ -204,7 +202,7 @@ LGPL License Terms @ref lgpl_license /* JEXTSEL[3:0]: External event selection for injected group. */ /****************************************************************************/ /** @defgroup adc_trigger_injected ADC Trigger Identifier for Injected group -@ingroup STM32F4xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_CR2_JEXTSEL_TIM1_CC4 (0x0 << 16) @@ -300,7 +298,7 @@ LGPL License Terms @ref lgpl_license /****************************************************************************/ /* ADC_SMPRG ADC Sample Time Selection for Channels */ /** @defgroup adc_sample_rg ADC Sample Time Selection for All Channels -@ingroup STM32F4xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_SMPR_SMP_3CYC 0x0 @@ -439,7 +437,7 @@ LGPL License Terms @ref lgpl_license /* ADCPRE: ADC prescaler. */ /****************************************************************************/ /** @defgroup adc_ccr_adcpre ADC Prescale -@ingroup STM32F4xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_CCR_ADCPRE_BY2 (0x0 << 16) @@ -453,7 +451,7 @@ LGPL License Terms @ref lgpl_license /* DMA: Direct memory access mode for multi ADC mode. */ /****************************************************************************/ /** @defgroup adc_dma_mode ADC DMA mode for multi ADC mode -@ingroup STM32F4xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_CCR_DMA_DISABLE (0x0 << 14) @@ -472,7 +470,7 @@ LGPL License Terms @ref lgpl_license /* DELAY: Delay between 2 sampling phases. */ /****************************************************************************/ /** @defgroup adc_delay ADC Delay between 2 sampling phases -@ingroup STM32F4xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_CCR_DELAY_5ADCCLK (0x0 << 8) @@ -500,7 +498,7 @@ LGPL License Terms @ref lgpl_license /* MULTI: Multi ADC mode selection. */ /****************************************************************************/ /** @defgroup adc_multi_mode ADC Multi mode selection -@ingroup STM32F4xx_adc_defines +@ingroup adc_defines @{*/ diff --git a/include/libopencm3/stm32/f4/crc.h b/include/libopencm3/stm32/f4/crc.h index 7aa1b293..ccda3a40 100644 --- a/include/libopencm3/stm32/f4/crc.h +++ b/include/libopencm3/stm32/f4/crc.h @@ -33,7 +33,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_CRC_H #define LIBOPENCM3_CRC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/crc_common_all.h> #endif diff --git a/include/libopencm3/stm32/f4/crypto.h b/include/libopencm3/stm32/f4/crypto.h index 3e758171..3dd433f7 100644 --- a/include/libopencm3/stm32/f4/crypto.h +++ b/include/libopencm3/stm32/f4/crypto.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_CRYPTO_H #define LIBOPENCM3_CRYPTO_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/crypto_common_f24.h> /**@{*/ diff --git a/include/libopencm3/stm32/f4/dac.h b/include/libopencm3/stm32/f4/dac.h index 1634fd74..f7714f3d 100644 --- a/include/libopencm3/stm32/f4/dac.h +++ b/include/libopencm3/stm32/f4/dac.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_DAC_H #define LIBOPENCM3_DAC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/dac_common_all.h> #endif diff --git a/include/libopencm3/stm32/f4/dma.h b/include/libopencm3/stm32/f4/dma.h index 1b308de0..229c64cd 100644 --- a/include/libopencm3/stm32/f4/dma.h +++ b/include/libopencm3/stm32/f4/dma.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_DMA_H #define LIBOPENCM3_DMA_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/dma_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f4/exti.h b/include/libopencm3/stm32/f4/exti.h index 33e979c0..727b5771 100644 --- a/include/libopencm3/stm32/f4/exti.h +++ b/include/libopencm3/stm32/f4/exti.h @@ -36,7 +36,6 @@ #ifndef LIBOPENCM3_EXTI_H #define LIBOPENCM3_EXTI_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/exti_common_l1f24.h> #endif diff --git a/include/libopencm3/stm32/f4/flash.h b/include/libopencm3/stm32/f4/flash.h index 8405bdc8..55f89721 100644 --- a/include/libopencm3/stm32/f4/flash.h +++ b/include/libopencm3/stm32/f4/flash.h @@ -31,7 +31,6 @@ #ifndef LIBOPENCM3_FLASH_H #define LIBOPENCM3_FLASH_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/flash_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f4/gpio.h b/include/libopencm3/stm32/f4/gpio.h index dae8b923..696b88be 100644 --- a/include/libopencm3/stm32/f4/gpio.h +++ b/include/libopencm3/stm32/f4/gpio.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_GPIO_H #define LIBOPENCM3_GPIO_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/gpio_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f4/hash.h b/include/libopencm3/stm32/f4/hash.h index bb010e5e..a44b374b 100644 --- a/include/libopencm3/stm32/f4/hash.h +++ b/include/libopencm3/stm32/f4/hash.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_HASH_H #define LIBOPENCM3_HASH_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/hash_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f4/i2c.h b/include/libopencm3/stm32/f4/i2c.h index 4f61f402..02b6a99d 100644 --- a/include/libopencm3/stm32/f4/i2c.h +++ b/include/libopencm3/stm32/f4/i2c.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_I2C_H #define LIBOPENCM3_I2C_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/i2c_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f4/iwdg.h b/include/libopencm3/stm32/f4/iwdg.h index f2280302..12f36120 100644 --- a/include/libopencm3/stm32/f4/iwdg.h +++ b/include/libopencm3/stm32/f4/iwdg.h @@ -33,7 +33,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_IWDG_H #define LIBOPENCM3_IWDG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/iwdg_common_all.h> #endif diff --git a/include/libopencm3/stm32/f4/pwr.h b/include/libopencm3/stm32/f4/pwr.h index e07d4d70..b2ff76f1 100644 --- a/include/libopencm3/stm32/f4/pwr.h +++ b/include/libopencm3/stm32/f4/pwr.h @@ -34,7 +34,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/pwr_common_all.h> /* diff --git a/include/libopencm3/stm32/f4/rcc.h b/include/libopencm3/stm32/f4/rcc.h index 928d8fa8..0d094f7f 100644 --- a/include/libopencm3/stm32/f4/rcc.h +++ b/include/libopencm3/stm32/f4/rcc.h @@ -45,9 +45,6 @@ #ifndef LIBOPENCM3_RCC_H #define LIBOPENCM3_RCC_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /* --- RCC registers ------------------------------------------------------- */ #define RCC_CR MMIO32(RCC_BASE + 0x00) diff --git a/include/libopencm3/stm32/f4/rng.h b/include/libopencm3/stm32/f4/rng.h index 2dbd5f17..6c3def69 100644 --- a/include/libopencm3/stm32/f4/rng.h +++ b/include/libopencm3/stm32/f4/rng.h @@ -18,7 +18,6 @@ #ifndef LIBOPENCM3_RNG_H #define LIBOPENCM3_RNG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/rng_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f4/rtc.h b/include/libopencm3/stm32/f4/rtc.h index b92a5bb6..555efcb5 100644 --- a/include/libopencm3/stm32/f4/rtc.h +++ b/include/libopencm3/stm32/f4/rtc.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_RTC_H #define LIBOPENCM3_RTC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/rtc_common_l1f024.h> BEGIN_DECLS diff --git a/include/libopencm3/stm32/f4/spi.h b/include/libopencm3/stm32/f4/spi.h index 5e2c5648..2ddeb124 100644 --- a/include/libopencm3/stm32/f4/spi.h +++ b/include/libopencm3/stm32/f4/spi.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_SPI_H #define LIBOPENCM3_SPI_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/spi_common_f24.h> #endif diff --git a/include/libopencm3/stm32/f4/syscfg.h b/include/libopencm3/stm32/f4/syscfg.h index 2f8cef29..5f4fba4a 100644 --- a/include/libopencm3/stm32/f4/syscfg.h +++ b/include/libopencm3/stm32/f4/syscfg.h @@ -36,7 +36,6 @@ #ifndef LIBOPENCM3_SYSCFG_H #define LIBOPENCM3_SYSCFG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/syscfg_common_l1f234.h> #endif diff --git a/include/libopencm3/stm32/f4/usart.h b/include/libopencm3/stm32/f4/usart.h index 6669e6b9..1332641e 100644 --- a/include/libopencm3/stm32/f4/usart.h +++ b/include/libopencm3/stm32/f4/usart.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_USART_H #define LIBOPENCM3_USART_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/usart_common_f24.h> #endif diff --git a/include/libopencm3/stm32/flash.h b/include/libopencm3/stm32/flash.h index 33a3d205..36132dfb 100644 --- a/include/libopencm3/stm32/flash.h +++ b/include/libopencm3/stm32/flash.h @@ -16,6 +16,10 @@ * You should have received a copy of the GNU Lesser General Public License * along with this library. If not, see <http://www.gnu.org/licenses/>. */ + +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/flash.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/fsmc.h b/include/libopencm3/stm32/fsmc.h index c577f334..818251cb 100644 --- a/include/libopencm3/stm32/fsmc.h +++ b/include/libopencm3/stm32/fsmc.h @@ -20,8 +20,8 @@ #ifndef LIBOPENCM3_FSMC_H #define LIBOPENCM3_FSMC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> #if defined(STM32F4) # include <libopencm3/stm32/f4/fmc.h> diff --git a/include/libopencm3/stm32/gpio.h b/include/libopencm3/stm32/gpio.h index fd163411..0560b5d7 100644 --- a/include/libopencm3/stm32/gpio.h +++ b/include/libopencm3/stm32/gpio.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/gpio.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/hash.h b/include/libopencm3/stm32/hash.h index 35a64b82..2659e687 100644 --- a/include/libopencm3/stm32/hash.h +++ b/include/libopencm3/stm32/hash.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F2) # include <libopencm3/stm32/f2/hash.h> #elif defined(STM32F4) diff --git a/include/libopencm3/stm32/i2c.h b/include/libopencm3/stm32/i2c.h index fc0997b7..6048617a 100644 --- a/include/libopencm3/stm32/i2c.h +++ b/include/libopencm3/stm32/i2c.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/i2c.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/iwdg.h b/include/libopencm3/stm32/iwdg.h index cfe8aadd..309d51d2 100644 --- a/include/libopencm3/stm32/iwdg.h +++ b/include/libopencm3/stm32/iwdg.h @@ -16,6 +16,10 @@ * You should have received a copy of the GNU Lesser General Public License * along with this library. If not, see <http://www.gnu.org/licenses/>. */ + +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/iwdg.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/l1/adc.h b/include/libopencm3/stm32/l1/adc.h index 3d4cecad..cd56d15a 100644 --- a/include/libopencm3/stm32/l1/adc.h +++ b/include/libopencm3/stm32/l1/adc.h @@ -1,4 +1,4 @@ -/** @defgroup STM32L1xx_adc_defines ADC Defines +/** @defgroup adc_defines ADC Defines @brief <b>Defined Constants and Types for the STM32L1xx Analog to Digital Converters</b> @@ -33,7 +33,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_ADC_H #define LIBOPENCM3_ADC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/adc_common_v1.h> #define ADC_MAX_REGULAR_SEQUENCE 28 @@ -108,7 +107,7 @@ LGPL License Terms @ref lgpl_license #define ADC_CR1_OVRIE (1 << 28) /****************************************************************************/ /** @defgroup adc_cr1_res ADC Resolution. -@ingroup STM32L1xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_CR1_RES_12_BIT 0 #define ADC_CR1_RES_10_BIT 1 @@ -131,7 +130,7 @@ LGPL License Terms @ref lgpl_license #define ADC_CR2_EXTEN_SHIFT 28 #define ADC_CR2_EXTEN_MASK (0x3 << ADC_CR2_EXTEN_SHIFT) /** @defgroup adc_trigger_polarity_regular ADC Trigger Polarity -@ingroup STM32L1xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_CR2_EXTEN_DISABLED (0x0 << ADC_CR2_EXTEN_SHIFT) #define ADC_CR2_EXTEN_RISING_EDGE (0x1 << ADC_CR2_EXTEN_SHIFT) @@ -144,7 +143,7 @@ LGPL License Terms @ref lgpl_license #define ADC_CR2_EXTSEL_SHIFT 24 #define ADC_CR2_EXTSEL_MASK (0xf << ADC_CR2_EXTSEL_SHIFT) /** @defgroup adc_trigger_regular ADC Trigger Identifier for Regular group -@ingroup STM32L1xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_CR2_EXTSEL_TIM9_CC2 (0 << ADC_CR2_EXTSEL_SHIFT) @@ -169,7 +168,7 @@ LGPL License Terms @ref lgpl_license #define ADC_CR2_JEXTEN_SHIFT 20 #define ADC_CR2_JEXTEN_MASK (0x3 << ADC_CR2_JEXTEN_SHIFT) /** @defgroup adc_trigger_polarity_injected ADC Injected Trigger Polarity -@ingroup STM32L1xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_CR2_JEXTEN_DISABLED (0x0 << ADC_CR2_JEXTEN_SHIFT) #define ADC_CR2_JEXTEN_RISING_EDGE (0x1 << ADC_CR2_JEXTEN_SHIFT) @@ -196,7 +195,7 @@ LGPL License Terms @ref lgpl_license /****************************************************************************/ /* ADC_SMPRG ADC Sample Time Selection for Channels */ /** @defgroup adc_sample_rg ADC Sample Time Selection for All Channels -@ingroup STM32L1xx_adc_defines +@ingroup adc_defines @{*/ #define ADC_SMPR_SMP_4CYC 0x0 diff --git a/include/libopencm3/stm32/l1/crc.h b/include/libopencm3/stm32/l1/crc.h index 1100be91..e019c346 100644 --- a/include/libopencm3/stm32/l1/crc.h +++ b/include/libopencm3/stm32/l1/crc.h @@ -33,7 +33,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_CRC_H #define LIBOPENCM3_CRC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/crc_common_all.h> #endif diff --git a/include/libopencm3/stm32/l1/dac.h b/include/libopencm3/stm32/l1/dac.h index 8a8854c3..207c59d4 100644 --- a/include/libopencm3/stm32/l1/dac.h +++ b/include/libopencm3/stm32/l1/dac.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_DAC_H #define LIBOPENCM3_DAC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/dac_common_all.h> #endif diff --git a/include/libopencm3/stm32/l1/dma.h b/include/libopencm3/stm32/l1/dma.h index 342d7868..c1728d18 100644 --- a/include/libopencm3/stm32/l1/dma.h +++ b/include/libopencm3/stm32/l1/dma.h @@ -36,7 +36,6 @@ #ifndef LIBOPENCM3_DMA_H #define LIBOPENCM3_DMA_H -#include <libopencm3/stm32/l1/memorymap.h> #include <libopencm3/stm32/common/dma_common_l1f013.h> #endif diff --git a/include/libopencm3/stm32/l1/exti.h b/include/libopencm3/stm32/l1/exti.h index 21bdd4e3..2c14c95f 100644 --- a/include/libopencm3/stm32/l1/exti.h +++ b/include/libopencm3/stm32/l1/exti.h @@ -36,7 +36,6 @@ #ifndef LIBOPENCM3_EXTI_H #define LIBOPENCM3_EXTI_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/exti_common_l1f24.h> #endif diff --git a/include/libopencm3/stm32/l1/flash.h b/include/libopencm3/stm32/l1/flash.h index bf30933b..a0c7a66e 100644 --- a/include/libopencm3/stm32/l1/flash.h +++ b/include/libopencm3/stm32/l1/flash.h @@ -44,9 +44,6 @@ #define LIBOPENCM3_FLASH_H /**@{*/ -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> - /* --- FLASH registers ----------------------------------------------------- */ #define FLASH_ACR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x00) diff --git a/include/libopencm3/stm32/l1/gpio.h b/include/libopencm3/stm32/l1/gpio.h index 8f0b90e4..f2c607ce 100644 --- a/include/libopencm3/stm32/l1/gpio.h +++ b/include/libopencm3/stm32/l1/gpio.h @@ -36,7 +36,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_GPIO_H #define LIBOPENCM3_GPIO_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/gpio_common_all.h> /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopencm3/stm32/l1/i2c.h b/include/libopencm3/stm32/l1/i2c.h index c2fd3ab4..c2ed3f33 100644 --- a/include/libopencm3/stm32/l1/i2c.h +++ b/include/libopencm3/stm32/l1/i2c.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_I2C_H #define LIBOPENCM3_I2C_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/i2c_common_all.h> #endif diff --git a/include/libopencm3/stm32/l1/iwdg.h b/include/libopencm3/stm32/l1/iwdg.h index 50e24acf..699849ad 100644 --- a/include/libopencm3/stm32/l1/iwdg.h +++ b/include/libopencm3/stm32/l1/iwdg.h @@ -33,7 +33,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_IWDG_H #define LIBOPENCM3_IWDG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/iwdg_common_all.h> #endif diff --git a/include/libopencm3/stm32/l1/pwr.h b/include/libopencm3/stm32/l1/pwr.h index 4c69ffe5..ddcdc070 100644 --- a/include/libopencm3/stm32/l1/pwr.h +++ b/include/libopencm3/stm32/l1/pwr.h @@ -36,7 +36,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/pwr_common_all.h> /* diff --git a/include/libopencm3/stm32/l1/rcc.h b/include/libopencm3/stm32/l1/rcc.h index ee794d5c..2b5883fc 100644 --- a/include/libopencm3/stm32/l1/rcc.h +++ b/include/libopencm3/stm32/l1/rcc.h @@ -48,8 +48,6 @@ #ifndef LIBOPENCM3_RCC_H #define LIBOPENCM3_RCC_H -#include <libopencm3/stm32/memorymap.h> -#include <libopencm3/cm3/common.h> #include <libopencm3/stm32/pwr.h> /* --- RCC registers ------------------------------------------------------- */ diff --git a/include/libopencm3/stm32/l1/rtc.h b/include/libopencm3/stm32/l1/rtc.h index afef4ba3..3ba885c2 100644 --- a/include/libopencm3/stm32/l1/rtc.h +++ b/include/libopencm3/stm32/l1/rtc.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_RTC_H #define LIBOPENCM3_RTC_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/rtc_common_l1f024.h> #endif diff --git a/include/libopencm3/stm32/l1/spi.h b/include/libopencm3/stm32/l1/spi.h index 2085ecec..0db17fc2 100644 --- a/include/libopencm3/stm32/l1/spi.h +++ b/include/libopencm3/stm32/l1/spi.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_SPI_H #define LIBOPENCM3_SPI_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/spi_common_l1f124.h> #endif diff --git a/include/libopencm3/stm32/l1/syscfg.h b/include/libopencm3/stm32/l1/syscfg.h index c7e48ad1..b2e4991d 100644 --- a/include/libopencm3/stm32/l1/syscfg.h +++ b/include/libopencm3/stm32/l1/syscfg.h @@ -36,7 +36,6 @@ #ifndef LIBOPENCM3_SYSCFG_H #define LIBOPENCM3_SYSCFG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/syscfg_common_l1f234.h> #endif diff --git a/include/libopencm3/stm32/l1/usart.h b/include/libopencm3/stm32/l1/usart.h index b887d7de..6fdce0e9 100644 --- a/include/libopencm3/stm32/l1/usart.h +++ b/include/libopencm3/stm32/l1/usart.h @@ -31,7 +31,6 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_USART_H #define LIBOPENCM3_USART_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/common/usart_common_f124.h> #endif diff --git a/include/libopencm3/stm32/otg_fs.h b/include/libopencm3/stm32/otg_fs.h index fc725987..887dcb93 100644 --- a/include/libopencm3/stm32/otg_fs.h +++ b/include/libopencm3/stm32/otg_fs.h @@ -20,8 +20,8 @@ #ifndef LIBOPENCM3_OTG_FS_H #define LIBOPENCM3_OTG_FS_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> /* Core Global Control and Status Registers */ #define OTG_FS_GOTGCTL MMIO32(USB_OTG_FS_BASE + 0x000) diff --git a/include/libopencm3/stm32/otg_hs.h b/include/libopencm3/stm32/otg_hs.h index db7b9b73..b685145f 100644 --- a/include/libopencm3/stm32/otg_hs.h +++ b/include/libopencm3/stm32/otg_hs.h @@ -20,8 +20,8 @@ #ifndef LIBOPENCM3_OTG_HS_H #define LIBOPENCM3_OTG_HS_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> /* Core Global Control and Status Registers */ #define OTG_GOTGCTL 0x000 diff --git a/include/libopencm3/stm32/pwr.h b/include/libopencm3/stm32/pwr.h index ca2d69fc..b15fcaca 100644 --- a/include/libopencm3/stm32/pwr.h +++ b/include/libopencm3/stm32/pwr.h @@ -16,6 +16,10 @@ * You should have received a copy of the GNU Lesser General Public License * along with this library. If not, see <http://www.gnu.org/licenses/>. */ + +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/pwr.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/rcc.h b/include/libopencm3/stm32/rcc.h index fd708c70..1eba4650 100644 --- a/include/libopencm3/stm32/rcc.h +++ b/include/libopencm3/stm32/rcc.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/rcc.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/rtc.h b/include/libopencm3/stm32/rtc.h index 6dbceeac..9b9dd242 100644 --- a/include/libopencm3/stm32/rtc.h +++ b/include/libopencm3/stm32/rtc.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/rtc.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/sdio.h b/include/libopencm3/stm32/sdio.h index b29830c4..6695f874 100644 --- a/include/libopencm3/stm32/sdio.h +++ b/include/libopencm3/stm32/sdio.h @@ -20,9 +20,8 @@ #ifndef LIBOPENCM3_SDIO_H #define LIBOPENCM3_SDIO_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/cm3/common.h> - +#include <libopencm3/stm32/memorymap.h> /* --- SDIO registers ------------------------------------------------------ */ diff --git a/include/libopencm3/stm32/spi.h b/include/libopencm3/stm32/spi.h index 06a25af4..9d0234e9 100644 --- a/include/libopencm3/stm32/spi.h +++ b/include/libopencm3/stm32/spi.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/spi.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/syscfg.h b/include/libopencm3/stm32/syscfg.h index 2428e58a..21138579 100644 --- a/include/libopencm3/stm32/syscfg.h +++ b/include/libopencm3/stm32/syscfg.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/syscfg.h> #elif defined(STM32F2) diff --git a/include/libopencm3/stm32/timer.h b/include/libopencm3/stm32/timer.h index 5b30d8c4..96f9985b 100644 --- a/include/libopencm3/stm32/timer.h +++ b/include/libopencm3/stm32/timer.h @@ -18,6 +18,10 @@ * You should have received a copy of the GNU Lesser General Public License * along with this library. If not, see <http://www.gnu.org/licenses/>. */ + +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/timer.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/tsc.h b/include/libopencm3/stm32/tsc.h index 597ccc5b..26971f01 100644 --- a/include/libopencm3/stm32/tsc.h +++ b/include/libopencm3/stm32/tsc.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/tsc.h> #else diff --git a/include/libopencm3/stm32/usart.h b/include/libopencm3/stm32/usart.h index c5662487..c85652fc 100644 --- a/include/libopencm3/stm32/usart.h +++ b/include/libopencm3/stm32/usart.h @@ -17,6 +17,9 @@ * along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> + #if defined(STM32F0) # include <libopencm3/stm32/f0/usart.h> #elif defined(STM32F1) diff --git a/include/libopencm3/stm32/usb.h b/include/libopencm3/stm32/usb.h index 14580855..ca5c294f 100644 --- a/include/libopencm3/stm32/usb.h +++ b/include/libopencm3/stm32/usb.h @@ -37,8 +37,8 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_USB_H #define LIBOPENCM3_USB_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/tools.h> /* --- USB base addresses -------------------------------------------------- */ diff --git a/include/libopencm3/stm32/wwdg.h b/include/libopencm3/stm32/wwdg.h index 72fa2bf8..ef75f095 100644 --- a/include/libopencm3/stm32/wwdg.h +++ b/include/libopencm3/stm32/wwdg.h @@ -20,8 +20,8 @@ #ifndef LIBOPENCM3_WWDG_H #define LIBOPENCM3_WWDG_H -#include <libopencm3/stm32/memorymap.h> #include <libopencm3/cm3/common.h> +#include <libopencm3/stm32/memorymap.h> /* --- WWDG registers ------------------------------------------------------ */ |