From 4b29bcee7ffe01b48d910f5a65b7f434dc9126e3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 20 Nov 2015 08:27:52 -0600 Subject: [PATCH] Rename up_rtcinitialize to up_rtc_initialize so that it looks like other RTC interfaces --- ChangeLog | 2 +- Documentation | 2 +- ReleaseNotes | 2 +- arch | 2 +- include/nuttx/arch.h | 4 ++-- sched/clock/clock_initialize.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c903285da5..24b20e48c9 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10045,7 +10045,7 @@ stm32_rtcc.c, stm32_rtcounter.c, and stm32f*_rcc.c: The STM32F4Discovery board doesn't come with a Low speed external oscillator so the default LSE source for the RTC doesn't work. In - stm32_rtcc.c the up_rtcinitialize() logic doesn't work with the LSI. + stm32_rtcc.c the up_rtc_initialize() logic doesn't work with the LSI. The check on RTC_MAGIC on the BK0R register lead to rtc_setup() call that rightfully enables the lsi clock; but the next times, when the rtc is already setup, the rtc_resume() call does NOT start the lsi diff --git a/Documentation b/Documentation index ffe506af46..4025464640 160000 --- a/Documentation +++ b/Documentation @@ -1 +1 @@ -Subproject commit ffe506af460b9828138ee395b7a3b7ab8ff9ef73 +Subproject commit 402546464095015a48662c75a13861a6100153fd diff --git a/ReleaseNotes b/ReleaseNotes index 1e5eb013d7..60634816ac 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -8777,7 +8777,7 @@ detailed bugfix information): Jussi Kivilinna. - STM32 RTC and clock control: The STM32F4Discovery board doesn't come with a Low speed external oscillator so the default LSE source - for the RTC doesn't work. In stm32_rtcc.c the up_rtcinitialize() + for the RTC doesn't work. In stm32_rtcc.c the up_rtc_initialize() logic doesn't work with the LSI. The check on RTC_MAGIC on the BK0R register lead to rtc_setup() call that rightfully enables the LSI clock; but the next times, when the rtc is already setup, the diff --git a/arch b/arch index a3bf280f61..676240da11 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit a3bf280f61d4670019587c67526ea076af134f89 +Subproject commit 676240da1156f13127dea95216f164d6ab4a766b diff --git a/include/nuttx/arch.h b/include/nuttx/arch.h index 0c79bd292c..3a03216d89 100644 --- a/include/nuttx/arch.h +++ b/include/nuttx/arch.h @@ -1765,7 +1765,7 @@ size_t up_check_intstack_remain(void); ****************************************************************************/ /**************************************************************************** - * Name: up_rtcinitialize + * Name: up_rtc_initialize * * Description: * Initialize the builtin, MCU hardware RTC per the selected @@ -1786,7 +1786,7 @@ size_t up_check_intstack_remain(void); ****************************************************************************/ #if defined(CONFIG_RTC) && !defined(CONFIG_RTC_EXTERNAL) -int up_rtcinitialize(void); +int up_rtc_initialize(void); #endif /************************************************************************************ diff --git a/sched/clock/clock_initialize.c b/sched/clock/clock_initialize.c index 11d889f6d0..507d61c772 100644 --- a/sched/clock/clock_initialize.c +++ b/sched/clock/clock_initialize.c @@ -206,7 +206,7 @@ void clock_initialize(void) * must be deferred until the system has booted. */ - up_rtcinitialize(); + up_rtc_initialize(); #endif /* Initialize the time value to match the RTC */