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.
2014-02-21 09:04:19 +10:30
parent 0f29fc8b1b
commit 7816501dbc
216 changed files with 191 additions and 322 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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 -------------------------------------------------- */
--- 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
--- 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
--- 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>

 /*
--- 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 ------------------------------------------------------- */
--- 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
--- 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
--- 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
--- 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