From 4bb18baa593ccba2c02371da23844ee9d056263b Mon Sep 17 00:00:00 2001 From: BuFran Date: Wed, 10 Jul 2013 14:06:53 +0200 Subject: [PATCH] [STM32F0:RTC] Renamed common files to be consistent to file naming scheme --- .../{rtc_common_bcd.h => rtc_common_l1f024.h} | 0 include/libopencm3/stm32/f0/rtc.h | 2 +- include/libopencm3/stm32/f2/rtc.h | 2 +- include/libopencm3/stm32/f4/rtc.h | 2 +- include/libopencm3/stm32/l1/rtc.h | 2 +- .../{rtc_common_bcd.c => rtc_common_l1f024.c} | 0 lib/stm32/f0/Makefile | 4 +-- lib/stm32/f0/rtc.c | 32 +++++++++++++++++++ lib/stm32/f2/Makefile | 2 +- lib/stm32/f2/rtc.c | 24 +++++++------- lib/stm32/f4/Makefile | 2 +- lib/stm32/f4/rtc.c | 24 +++++++------- lib/stm32/l1/Makefile | 2 +- lib/stm32/l1/rtc.c | 24 +++++++------- 14 files changed, 77 insertions(+), 45 deletions(-) rename include/libopencm3/stm32/common/{rtc_common_bcd.h => rtc_common_l1f024.h} (100%) rename lib/stm32/common/{rtc_common_bcd.c => rtc_common_l1f024.c} (100%) create mode 100644 lib/stm32/f0/rtc.c diff --git a/include/libopencm3/stm32/common/rtc_common_bcd.h b/include/libopencm3/stm32/common/rtc_common_l1f024.h similarity index 100% rename from include/libopencm3/stm32/common/rtc_common_bcd.h rename to include/libopencm3/stm32/common/rtc_common_l1f024.h diff --git a/include/libopencm3/stm32/f0/rtc.h b/include/libopencm3/stm32/f0/rtc.h index 7b773a71..79b08508 100644 --- a/include/libopencm3/stm32/f0/rtc.h +++ b/include/libopencm3/stm32/f0/rtc.h @@ -32,6 +32,6 @@ #define LIBOPENCM3_RTC_H #include -#include +#include #endif diff --git a/include/libopencm3/stm32/f2/rtc.h b/include/libopencm3/stm32/f2/rtc.h index e78043ce..84faae5d 100644 --- a/include/libopencm3/stm32/f2/rtc.h +++ b/include/libopencm3/stm32/f2/rtc.h @@ -32,6 +32,6 @@ LGPL License Terms @ref lgpl_license #define LIBOPENCM3_RTC_H #include -#include +#include #endif diff --git a/include/libopencm3/stm32/f4/rtc.h b/include/libopencm3/stm32/f4/rtc.h index 752895ba..b92a5bb6 100644 --- a/include/libopencm3/stm32/f4/rtc.h +++ b/include/libopencm3/stm32/f4/rtc.h @@ -32,7 +32,7 @@ LGPL License Terms @ref lgpl_license #define LIBOPENCM3_RTC_H #include -#include +#include BEGIN_DECLS diff --git a/include/libopencm3/stm32/l1/rtc.h b/include/libopencm3/stm32/l1/rtc.h index 95331d32..afef4ba3 100644 --- a/include/libopencm3/stm32/l1/rtc.h +++ b/include/libopencm3/stm32/l1/rtc.h @@ -32,6 +32,6 @@ LGPL License Terms @ref lgpl_license #define LIBOPENCM3_RTC_H #include -#include +#include #endif diff --git a/lib/stm32/common/rtc_common_bcd.c b/lib/stm32/common/rtc_common_l1f024.c similarity index 100% rename from lib/stm32/common/rtc_common_bcd.c rename to lib/stm32/common/rtc_common_l1f024.c diff --git a/lib/stm32/f0/Makefile b/lib/stm32/f0/Makefile index b754583d..b1040fd0 100644 --- a/lib/stm32/f0/Makefile +++ b/lib/stm32/f0/Makefile @@ -33,10 +33,10 @@ CFLAGS = -Os -g \ ARFLAGS = rcs -OBJS = flash.o rcc.o usart.o dma.o +OBJS = flash.o rcc.o usart.o dma.o rtc.o OBJS += gpio_common_all.o gpio_common_f0234.o crc_common_all.o \ - pwr_common_all.o iwdg_common_all.o rtc_common_bcd.o \ + pwr_common_all.o iwdg_common_all.o rtc_common_l1f024.o \ dma_common_l1f013.o VPATH += ../../usb:../:../../cm3:../common diff --git a/lib/stm32/f0/rtc.c b/lib/stm32/f0/rtc.c new file mode 100644 index 00000000..dc67c74e --- /dev/null +++ b/lib/stm32/f0/rtc.c @@ -0,0 +1,32 @@ +/** @defgroup rtc_file RTC + * + * @ingroup STM32F0xx + * + * @brief libopencm3 STM32F0xx RTC + * + * @version 1.0.0 + * + * @date 10 July 2013 + * + * LGPL License Terms @ref lgpl_license + */ + +/* + * This file is part of the libopencm3 project. + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +#include +#include diff --git a/lib/stm32/f2/Makefile b/lib/stm32/f2/Makefile index a43fb189..aab0109b 100644 --- a/lib/stm32/f2/Makefile +++ b/lib/stm32/f2/Makefile @@ -37,7 +37,7 @@ OBJS = gpio.o exti.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_all.o \ - iwdg_common_all.o rtc_common_bcd.o spi_common_all.o \ + iwdg_common_all.o rtc_common_l1f024.o spi_common_all.o \ spi_common_f124.o timer_common_all.o timer_common_f234.o \ timer_common_f24.o usart_common_all.o usart_common_f124.o \ flash_common_f234.o flash_common_f24.o hash_common_f24.o \ diff --git a/lib/stm32/f2/rtc.c b/lib/stm32/f2/rtc.c index 310fe434..6ffa3e83 100644 --- a/lib/stm32/f2/rtc.c +++ b/lib/stm32/f2/rtc.c @@ -1,15 +1,15 @@ /** @defgroup rtc_file RTC - -@ingroup STM32F2xx - -@brief libopencm3 STM32F2xx RTC - -@version 1.0.0 - -@date 4 March 2013 - -LGPL License Terms @ref lgpl_license -*/ + * + * @ingroup STM32F2xx + * + * @brief libopencm3 STM32F2xx RTC + * + * @version 1.0.0 + * + * @date 4 March 2013 + * + * LGPL License Terms @ref lgpl_license + */ /* * This file is part of the libopencm3 project. @@ -29,4 +29,4 @@ LGPL License Terms @ref lgpl_license */ #include -#include +#include diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile index 1d691a22..1e451c08 100644 --- a/lib/stm32/f4/Makefile +++ b/lib/stm32/f4/Makefile @@ -40,7 +40,7 @@ OBJS = adc.o can.o gpio.o exti.o pwr.o rcc.o rtc.o crypto.o OBJS += crc_common_all.o dac_common_all.o dma_common_f24.o \ gpio_common_all.o gpio_common_f0234.o i2c_common_all.o \ - iwdg_common_all.o pwr_common_all.o rtc_common_bcd.o \ + iwdg_common_all.o pwr_common_all.o rtc_common_l1f024.o \ spi_common_all.o spi_common_f124.o timer_common_all.o \ timer_common_f234.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/f4/rtc.c b/lib/stm32/f4/rtc.c index 4de488da..2991cb98 100644 --- a/lib/stm32/f4/rtc.c +++ b/lib/stm32/f4/rtc.c @@ -1,15 +1,15 @@ /** @defgroup rtc_file RTC - -@ingroup STM32F4xx - -@brief libopencm3 STM32F4xx RTC - -@version 1.0.0 - -@date 4 March 2013 - -LGPL License Terms @ref lgpl_license -*/ + * + * @ingroup STM32F4xx + * + * @brief libopencm3 STM32F4xx RTC + * + * @version 1.0.0 + * + * @date 4 March 2013 + * + * LGPL License Terms @ref lgpl_license + */ /* * This file is part of the libopencm3 project. @@ -31,7 +31,7 @@ LGPL License Terms @ref lgpl_license #include #include #include -#include +#include /*---------------------------------------------------------------------------*/ diff --git a/lib/stm32/l1/Makefile b/lib/stm32/l1/Makefile index 43108782..2ec914d0 100644 --- a/lib/stm32/l1/Makefile +++ b/lib/stm32/l1/Makefile @@ -37,7 +37,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_all.o iwdg_common_all.o -OBJS += pwr_common_all.o pwr.o rtc_common_bcd.o +OBJS += pwr_common_all.o pwr.o rtc_common_l1f024.o OBJS += spi_common_all.o timer_common_all.o OBJS += usart_common_all.o usart_common_f124.o diff --git a/lib/stm32/l1/rtc.c b/lib/stm32/l1/rtc.c index 1afd5973..913d3a4b 100644 --- a/lib/stm32/l1/rtc.c +++ b/lib/stm32/l1/rtc.c @@ -1,15 +1,15 @@ /** @defgroup rtc_file RTC - -@ingroup STM32L1xx - -@brief libopencm3 STM32L1xx RTC - -@version 1.0.0 - -@date 4 March 2013 - -LGPL License Terms @ref lgpl_license -*/ + * + * @ingroup STM32L1xx + * + * @brief libopencm3 STM32L1xx RTC + * + * @version 1.0.0 + * + * @date 4 March 2013 + * + * LGPL License Terms @ref lgpl_license + */ /* * This file is part of the libopencm3 project. @@ -29,4 +29,4 @@ LGPL License Terms @ref lgpl_license */ #include -#include +#include