EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stm32: renamed pwr_common_all to pwr_common_v1, and pwr_common_l01 to pwr_common_v2

Browse Source
This commit is contained in:
Matthew Lai
2017-03-12 20:25:33 +00:00
committed by Karl Palsson
parent d1d511c6f4
commit 383fafc862
16 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/libopencm3/stm32/common/pwr_common_all.h → include/libopencm3/stm32/common/pwr_common_v1.h
View File

@@ -30,8 +30,8 @@ specific memorymap.h header before including this header file.*/
/** @cond */ /** @cond */
#ifdef LIBOPENCM3_PWR_H #ifdef LIBOPENCM3_PWR_H
/** @endcond */ /** @endcond */
#ifndef LIBOPENCM3_PWR_COMMON_ALL_H #ifndef LIBOPENCM3_PWR_COMMON_V1_H
#define LIBOPENCM3_PWR_COMMON_ALL_H #define LIBOPENCM3_PWR_COMMON_V1_H
/**@{*/ /**@{*/
@@ -126,7 +126,7 @@ END_DECLS
#endif #endif
/** @cond */ /** @cond */
#else #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 #endif
/** @endcond */ /** @endcond */

2
include/libopencm3/stm32/common/pwr_common_l01.h → include/libopencm3/stm32/common/pwr_common_v2.h
View File

@@ -26,7 +26,7 @@
#ifndef LIBOPENCM3_PWR_COMMON_L01_H #ifndef LIBOPENCM3_PWR_COMMON_L01_H
#define LIBOPENCM3_PWR_COMMON_L01_H #define LIBOPENCM3_PWR_COMMON_L01_H
#include <libopencm3/stm32/common/pwr_common_all.h> #include <libopencm3/stm32/common/pwr_common_v1.h>
/* --- PWR_CR values ------------------------------------------------------- */ /* --- PWR_CR values ------------------------------------------------------- */

2
include/libopencm3/stm32/f0/pwr.h
View File

@@ -31,7 +31,7 @@
#ifndef LIBOPENCM3_PWR_H #ifndef LIBOPENCM3_PWR_H
#define LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H
#include <libopencm3/stm32/common/pwr_common_all.h> #include <libopencm3/stm32/common/pwr_common_v1.h>
/*****************************************************************************/ /*****************************************************************************/
/* Module definitions */ /* Module definitions */

2
include/libopencm3/stm32/f1/pwr.h
View File

@@ -31,7 +31,7 @@ LGPL License Terms @ref lgpl_license
#ifndef LIBOPENCM3_PWR_H #ifndef LIBOPENCM3_PWR_H
#define LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H
#include <libopencm3/stm32/common/pwr_common_all.h> #include <libopencm3/stm32/common/pwr_common_v1.h>
#endif #endif

2
include/libopencm3/stm32/f2/pwr.h
View File

@@ -33,7 +33,7 @@ LGPL License Terms @ref lgpl_license
#ifndef LIBOPENCM3_PWR_H #ifndef LIBOPENCM3_PWR_H
#define LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H
#include <libopencm3/stm32/common/pwr_common_all.h> #include <libopencm3/stm32/common/pwr_common_v1.h>
/* /*
* This file extends the common STM32 version with definitions only * This file extends the common STM32 version with definitions only

2
include/libopencm3/stm32/f3/pwr.h
View File

@@ -41,7 +41,7 @@
#ifndef LIBOPENCM3_PWR_H #ifndef LIBOPENCM3_PWR_H
#define LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H
#include <libopencm3/stm32/common/pwr_common_all.h> #include <libopencm3/stm32/common/pwr_common_v1.h>
/* --- PWR_CR values ------------------------------------------------------- */ /* --- PWR_CR values ------------------------------------------------------- */

2
include/libopencm3/stm32/f4/pwr.h
View File

@@ -34,7 +34,7 @@ LGPL License Terms @ref lgpl_license
#ifndef LIBOPENCM3_PWR_H #ifndef LIBOPENCM3_PWR_H
#define LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H
#include <libopencm3/stm32/common/pwr_common_all.h> #include <libopencm3/stm32/common/pwr_common_v1.h>
/* /*
* This file extends the common STM32 version with definitions only * This file extends the common STM32 version with definitions only

2
include/libopencm3/stm32/l0/pwr.h
View File

@@ -31,7 +31,7 @@
#ifndef LIBOPENCM3_PWR_H #ifndef LIBOPENCM3_PWR_H
#define LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H
#include <libopencm3/stm32/common/pwr_common_l01.h> #include <libopencm3/stm32/common/pwr_common_v2.h>
#endif #endif

2
include/libopencm3/stm32/l1/pwr.h
View File

@@ -36,7 +36,7 @@ LGPL License Terms @ref lgpl_license
#ifndef LIBOPENCM3_PWR_H #ifndef LIBOPENCM3_PWR_H
#define LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H
#include <libopencm3/stm32/common/pwr_common_l01.h> #include <libopencm3/stm32/common/pwr_common_v2.h>
/* /*
* This file extends the common STM32 version with definitions only * This file extends the common STM32 version with definitions only

0
lib/stm32/common/pwr_common_all.c → lib/stm32/common/pwr_common_v1.c
View File

0
lib/stm32/common/pwr_common_l01.c → lib/stm32/common/pwr_common_v2.c
View File

2
lib/stm32/f0/Makefile
View File

@@ -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 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 \ 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 \ dma_common_l1f013.o exti_common_all.o spi_common_all.o \
spi_common_f03.o flash_common_f01.o dac_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 timer_common_all.o timer_common_f0234.o rcc_common_all.o

2
lib/stm32/f1/Makefile
View File

@@ -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 \ 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 \ 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 \ timer_common_all.o usart_common_all.o usart_common_f124.o \
rcc_common_all.o exti_common_all.o \ rcc_common_all.o exti_common_all.o \
flash_common_f01.o flash_common_f01.o

2
lib/stm32/f4/Makefile
View File

@@ -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 \ 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 \ 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 \ spi_common_all.o spi_common_l1f124.o timer_common_all.o \
timer_common_f0234.o timer_common_f24.o usart_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 \ usart_common_f124.o flash_common_f234.o flash_common_f24.o \

2
lib/stm32/l0/Makefile
View File

@@ -36,7 +36,7 @@ TGT_CFLAGS += $(DEBUG_FLAGS)
ARFLAGS = rcs ARFLAGS = rcs
OBJS = gpio.o rcc.o desig.o 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 += timer_common_all.o
OBJS += gpio_common_all.o gpio_common_f0234.o rcc_common_all.o OBJS += gpio_common_all.o gpio_common_f0234.o rcc_common_all.o

2
lib/stm32/l1/Makefile
View File

@@ -39,7 +39,7 @@ OBJS += crc_common_all.o dac_common_all.o
OBJS += dma_common_l1f013.o OBJS += dma_common_l1f013.o
OBJS += gpio_common_all.o gpio_common_f0234.o OBJS += gpio_common_all.o gpio_common_f0234.o
OBJS += i2c_common_v1.o iwdg_common_all.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 += spi_common_all.o spi_common_l1f124.o timer_common_all.o
OBJS += usart_common_all.o usart_common_f124.o OBJS += usart_common_all.o usart_common_f124.o
OBJS += exti_common_all.o OBJS += exti_common_all.o