diff --git a/include/libopencm3/stm32/common/pwr_common_all.h b/include/libopencm3/stm32/common/pwr_common_v1.h similarity index 96% rename from include/libopencm3/stm32/common/pwr_common_all.h rename to include/libopencm3/stm32/common/pwr_common_v1.h index 56d2fe11..273c5dee 100644 --- a/include/libopencm3/stm32/common/pwr_common_all.h +++ b/include/libopencm3/stm32/common/pwr_common_v1.h @@ -30,8 +30,8 @@ specific memorymap.h header before including this header file.*/ /** @cond */ #ifdef LIBOPENCM3_PWR_H /** @endcond */ -#ifndef LIBOPENCM3_PWR_COMMON_ALL_H -#define LIBOPENCM3_PWR_COMMON_ALL_H +#ifndef LIBOPENCM3_PWR_COMMON_V1_H +#define LIBOPENCM3_PWR_COMMON_V1_H /**@{*/ @@ -126,7 +126,7 @@ END_DECLS #endif /** @cond */ #else -#warning "pwr_common_all.h should not be included explicitly, only via pwr.h" +#warning "pwr_common_v1.h should not be included explicitly, only via pwr.h" #endif /** @endcond */ diff --git a/include/libopencm3/stm32/common/pwr_common_l01.h b/include/libopencm3/stm32/common/pwr_common_v2.h similarity index 98% rename from include/libopencm3/stm32/common/pwr_common_l01.h rename to include/libopencm3/stm32/common/pwr_common_v2.h index ee10e268..e665ccfd 100644 --- a/include/libopencm3/stm32/common/pwr_common_l01.h +++ b/include/libopencm3/stm32/common/pwr_common_v2.h @@ -26,7 +26,7 @@ #ifndef LIBOPENCM3_PWR_COMMON_L01_H #define LIBOPENCM3_PWR_COMMON_L01_H -#include +#include /* --- PWR_CR values ------------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f0/pwr.h b/include/libopencm3/stm32/f0/pwr.h index e0706b63..c01c7d38 100644 --- a/include/libopencm3/stm32/f0/pwr.h +++ b/include/libopencm3/stm32/f0/pwr.h @@ -31,7 +31,7 @@ #ifndef LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H -#include +#include /*****************************************************************************/ /* Module definitions */ diff --git a/include/libopencm3/stm32/f1/pwr.h b/include/libopencm3/stm32/f1/pwr.h index 51b39775..27e899b6 100644 --- a/include/libopencm3/stm32/f1/pwr.h +++ b/include/libopencm3/stm32/f1/pwr.h @@ -31,7 +31,7 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H -#include +#include #endif diff --git a/include/libopencm3/stm32/f2/pwr.h b/include/libopencm3/stm32/f2/pwr.h index 72b01d9f..5100eeeb 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_H #define LIBOPENCM3_PWR_H -#include +#include /* * This file extends the common STM32 version with definitions only diff --git a/include/libopencm3/stm32/f3/pwr.h b/include/libopencm3/stm32/f3/pwr.h index 3789b78b..08bfbe2f 100644 --- a/include/libopencm3/stm32/f3/pwr.h +++ b/include/libopencm3/stm32/f3/pwr.h @@ -41,7 +41,7 @@ #ifndef LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H -#include +#include /* --- PWR_CR values ------------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f4/pwr.h b/include/libopencm3/stm32/f4/pwr.h index fc605118..ab608333 100644 --- a/include/libopencm3/stm32/f4/pwr.h +++ b/include/libopencm3/stm32/f4/pwr.h @@ -34,7 +34,7 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H -#include +#include /* * This file extends the common STM32 version with definitions only diff --git a/include/libopencm3/stm32/l0/pwr.h b/include/libopencm3/stm32/l0/pwr.h index 99c820df..bb2ff9a0 100644 --- a/include/libopencm3/stm32/l0/pwr.h +++ b/include/libopencm3/stm32/l0/pwr.h @@ -31,7 +31,7 @@ #ifndef LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H -#include +#include #endif diff --git a/include/libopencm3/stm32/l1/pwr.h b/include/libopencm3/stm32/l1/pwr.h index 55e5013f..4a694e8d 100644 --- a/include/libopencm3/stm32/l1/pwr.h +++ b/include/libopencm3/stm32/l1/pwr.h @@ -36,7 +36,7 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H -#include +#include /* * This file extends the common STM32 version with definitions only diff --git a/lib/stm32/common/pwr_common_all.c b/lib/stm32/common/pwr_common_v1.c similarity index 100% rename from lib/stm32/common/pwr_common_all.c rename to lib/stm32/common/pwr_common_v1.c diff --git a/lib/stm32/common/pwr_common_l01.c b/lib/stm32/common/pwr_common_v2.c similarity index 100% rename from lib/stm32/common/pwr_common_l01.c rename to lib/stm32/common/pwr_common_v2.c diff --git a/lib/stm32/f0/Makefile b/lib/stm32/f0/Makefile index e7406726..937871d9 100644 --- a/lib/stm32/f0/Makefile +++ b/lib/stm32/f0/Makefile @@ -39,7 +39,7 @@ OBJS = flash.o rcc.o usart.o dma.o rtc.o comparator.o crc.o \ dac.o iwdg.o pwr.o gpio.o timer.o adc.o desig.o OBJS += gpio_common_all.o gpio_common_f0234.o crc_common_all.o \ - pwr_common_all.o iwdg_common_all.o rtc_common_l1f024.o \ + pwr_common_v1.o iwdg_common_all.o rtc_common_l1f024.o \ dma_common_l1f013.o exti_common_all.o spi_common_all.o \ spi_common_f03.o flash_common_f01.o dac_common_all.o \ timer_common_all.o timer_common_f0234.o rcc_common_all.o diff --git a/lib/stm32/f1/Makefile b/lib/stm32/f1/Makefile index 3022d358..d0704f39 100755 --- a/lib/stm32/f1/Makefile +++ b/lib/stm32/f1/Makefile @@ -41,7 +41,7 @@ OBJS += mac.o mac_stm32fxx7.o phy.o phy_ksz8051mll.o OBJS += crc_common_all.o dac_common_all.o dma_common_l1f013.o \ gpio_common_all.o i2c_common_v1.o iwdg_common_all.o \ - pwr_common_all.o spi_common_all.o spi_common_l1f124.o \ + pwr_common_v1.o spi_common_all.o spi_common_l1f124.o \ timer_common_all.o usart_common_all.o usart_common_f124.o \ rcc_common_all.o exti_common_all.o \ flash_common_f01.o diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile index 6180c519..b20a3196 100644 --- a/lib/stm32/f4/Makefile +++ b/lib/stm32/f4/Makefile @@ -43,7 +43,7 @@ OBJS = adc.o adc_common_v1.o can.o desig.o gpio.o pwr.o rcc.o \ OBJS += crc_common_all.o dac_common_all.o dma_common_f24.o \ gpio_common_all.o gpio_common_f0234.o i2c_common_v1.o \ - iwdg_common_all.o pwr_common_all.o rtc_common_l1f024.o \ + iwdg_common_all.o pwr_common_v1.o rtc_common_l1f024.o \ spi_common_all.o spi_common_l1f124.o timer_common_all.o \ timer_common_f0234.o timer_common_f24.o usart_common_all.o \ usart_common_f124.o flash_common_f234.o flash_common_f24.o \ diff --git a/lib/stm32/l0/Makefile b/lib/stm32/l0/Makefile index 82838ad8..756f654c 100644 --- a/lib/stm32/l0/Makefile +++ b/lib/stm32/l0/Makefile @@ -36,7 +36,7 @@ TGT_CFLAGS += $(DEBUG_FLAGS) ARFLAGS = rcs OBJS = gpio.o rcc.o desig.o -OBJS += pwr_common_all.o pwr_common_l01.o +OBJS += pwr_common_v1.o pwr_common_v2.o OBJS += timer_common_all.o OBJS += gpio_common_all.o gpio_common_f0234.o rcc_common_all.o diff --git a/lib/stm32/l1/Makefile b/lib/stm32/l1/Makefile index ff0fd010..378f842a 100644 --- a/lib/stm32/l1/Makefile +++ b/lib/stm32/l1/Makefile @@ -39,7 +39,7 @@ OBJS += crc_common_all.o dac_common_all.o OBJS += dma_common_l1f013.o OBJS += gpio_common_all.o gpio_common_f0234.o OBJS += i2c_common_v1.o iwdg_common_all.o -OBJS += pwr_common_all.o pwr_common_l01.o rtc_common_l1f024.o +OBJS += pwr_common_v1.o pwr_common_v2.o rtc_common_l1f024.o OBJS += spi_common_all.o spi_common_l1f124.o timer_common_all.o OBJS += usart_common_all.o usart_common_f124.o OBJS += exti_common_all.o