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.

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)

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

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

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

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

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

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

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

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)

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

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)

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)

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

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

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

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

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

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

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

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

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

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)
 

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

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

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

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

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

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

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)

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

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)

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)

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

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

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)

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)

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

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

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

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

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

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/common/dac_common_all.h>
-#include <libopencm3/stm32/memorymap.h>
 
 /*****************************************************************************/
 /* Module definitions                                                        */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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)