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.
This commit is contained in:
committed by
Karl Palsson
parent
0f29fc8b1b
commit
7816501dbc
@@ -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 -------------------------------------------------- */
|
||||
|
||||
@@ -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) */
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
|
||||
/**@{*/
|
||||
|
||||
#include <libopencm3/stm32/memorymap.h>
|
||||
#include <libopencm3/stm32/common/flash_common_f01.h>
|
||||
|
||||
/* --- FLASH_OPTION bytes ------------------------------------------------- */
|
||||
|
||||
@@ -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 -------------------------------------------------- */
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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. */
|
||||
|
||||
|
||||
@@ -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 ------------------------------------------------------- */
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user