diff --git a/arch/arm/src/stm32/stm32_rtcc.c b/arch/arm/src/stm32/stm32_rtcc.c index eb8767dc814..b5dad05a6bd 100644 --- a/arch/arm/src/stm32/stm32_rtcc.c +++ b/arch/arm/src/stm32/stm32_rtcc.c @@ -104,16 +104,6 @@ volatile bool g_rtc_enabled = false; ************************************************************************************/ /************************************************************************************ * Name: rtc_dumpregs - * - * Description: - * Disable RTC write protection - * - * Input Parameters: - * None - * - * Returned Value: - * None - * ************************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO @@ -147,16 +137,6 @@ static void rtc_dumpregs(FAR const char *msg) /************************************************************************************ * Name: rtc_dumptime - * - * Description: - * Disable RTC write protection - * - * Input Parameters: - * None - * - * Returned Value: - * None - * ************************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c index d508a8ae32f..94558c98b34 100644 --- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c +++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c @@ -58,7 +58,7 @@ #include -#if defined(CONFIG_RTC) && !defined(CONFIG_RTC_EXTERNAL) +#ifdef CONFIG_STM32_RTC /**************************************************************************** * Pre-processor Definitions @@ -167,16 +167,6 @@ static inline void rtc_enable_alarm(void); /**************************************************************************** * Name: rtc_dumpregs - * - * Description: - * Disable RTC write protection - * - * Input Parameters: - * None - * - * Returned Value: - * None - * ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO @@ -216,16 +206,6 @@ static void rtc_dumpregs(FAR const char *msg) /**************************************************************************** * Name: rtc_dumptime - * - * Description: - * Disable RTC write protection - * - * Input Parameters: - * None - * - * Returned Value: - * None - * ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO @@ -751,9 +731,7 @@ static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg) { int ret = -EBUSY; - /* Need to follow RTC register wrote protection - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -787,9 +765,7 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg) { int ret = -EBUSY; - /* Need to follow RTC register wrote protection - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -1319,7 +1295,7 @@ int stm32_rtc_setdatetime(FAR const struct tm *tp) /* Then write the broken out values to the RTC */ - /* Convert the struct tm format to RTC time register fields. All of the STM32 + /* Convert the struct tm format to RTC time register fields. * All of the ranges of values correspond between struct tm and the time * register. */ @@ -1537,9 +1513,7 @@ int stm32_rtc_cancelalarm(enum alm_id_e alarmid) g_alarmcb[alarmid].ac_cb = NULL; g_alarmcb[alarmid].ac_arg = NULL; - /* Need to follow RTC register wrote protection. - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -1569,9 +1543,7 @@ int stm32_rtc_cancelalarm(enum alm_id_e alarmid) g_alarmcb[alarmid].ac_cb = NULL; g_alarmcb[alarmid].ac_arg = NULL; - /* Need to follow RTC register wrote protection. - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -1607,7 +1579,7 @@ errout_with_wprunlock: } #endif -/************************************************************************************ +/**************************************************************************** * Name: stm32_rtc_rdalarm * * Description: @@ -1619,7 +1591,7 @@ errout_with_wprunlock: * Returned Value: * Zero (OK) on success; a negated errno on failure * - ************************************************************************************/ + ****************************************************************************/ #ifdef CONFIG_RTC_ALARM int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo) @@ -1645,7 +1617,7 @@ int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo) { alarmreg = STM32_RTC_ALRMBR; ret = stm32_rtc_getalarmdatetime(alarmreg, - (struct tm *)alminfo->ar_time); + (struct tm *)alminfo->ar_time); } break; #endif @@ -1659,5 +1631,5 @@ int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo) } #endif -#endif /* CONFIG_RTC && !CONFIG_RTC_EXTERNAL */ +#endif /* CONFIG_STM32_RTC */ diff --git a/arch/arm/src/stm32/stm32l15xxx_rtcc.c b/arch/arm/src/stm32/stm32l15xxx_rtcc.c index 26ba96b2332..b8a1d10ebbc 100644 --- a/arch/arm/src/stm32/stm32l15xxx_rtcc.c +++ b/arch/arm/src/stm32/stm32l15xxx_rtcc.c @@ -170,16 +170,6 @@ static inline void rtc_enable_alarm(void); /**************************************************************************** * Name: rtc_dumpregs - * - * Description: - * Disable RTC write protection - * - * Input Parameters: - * None - * - * Returned Value: - * None - * ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO @@ -211,16 +201,6 @@ static void rtc_dumpregs(FAR const char *msg) /**************************************************************************** * Name: rtc_dumptime - * - * Description: - * Disable RTC write protection - * - * Input Parameters: - * None - * - * Returned Value: - * None - * ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO @@ -685,9 +665,7 @@ static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg) int isr; int ret = -EBUSY; - /* Need to allow RTC register write - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -730,9 +708,7 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg) int isr; int ret = -EBUSY; - /* Need to allow RTC register write - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -1510,9 +1486,7 @@ int stm32_rtc_cancelalarm(enum alm_id_e alarmid) g_alarmcb[alarmid].ac_cb = NULL; g_alarmcb[alarmid].ac_arg = NULL; - /* Need to follow RTC register wrote protection. - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -1543,9 +1517,7 @@ int stm32_rtc_cancelalarm(enum alm_id_e alarmid) g_alarmcb[alarmid].ac_cb = NULL; g_alarmcb[alarmid].ac_arg = NULL; - /* Need to follow RTC register wrote protection. - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); diff --git a/arch/arm/src/stm32f7/stm32_rtc.c b/arch/arm/src/stm32f7/stm32_rtc.c index 47a6770e834..60ee8145dbe 100644 --- a/arch/arm/src/stm32f7/stm32_rtc.c +++ b/arch/arm/src/stm32f7/stm32_rtc.c @@ -169,16 +169,6 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg); /**************************************************************************** * Name: rtc_dumpregs - * - * Description: - * Disable RTC write protection - * - * Input Parameters: - * None - * - * Returned Value: - * None - * ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO @@ -218,16 +208,6 @@ static void rtc_dumpregs(FAR const char *msg) /**************************************************************************** * Name: rtc_dumptime - * - * Description: - * Disable RTC write protection - * - * Input Parameters: - * None - * - * Returned Value: - * None - * ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO @@ -767,9 +747,7 @@ static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg) int isr; int ret = -EBUSY; - /* Need to allow RTC register write - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -812,9 +790,7 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg) int isr; int ret = -EBUSY; - /* Need to allow RTC register write - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -1581,9 +1557,7 @@ int stm32_rtc_cancelalarm(enum alm_id_e alarmid) g_alarmcb[alarmid].ac_cb = NULL; g_alarmcb[alarmid].ac_arg = NULL; - /* Need to follow RTC register wrote protection. - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -1614,9 +1588,7 @@ int stm32_rtc_cancelalarm(enum alm_id_e alarmid) g_alarmcb[alarmid].ac_cb = NULL; g_alarmcb[alarmid].ac_arg = NULL; - /* Need to follow RTC register wrote protection. - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); diff --git a/arch/arm/src/stm32l4/stm32l4_rtc.c b/arch/arm/src/stm32l4/stm32l4_rtc.c index 3f7e15b95c2..b319e32d8a2 100644 --- a/arch/arm/src/stm32l4/stm32l4_rtc.c +++ b/arch/arm/src/stm32l4/stm32l4_rtc.c @@ -149,16 +149,6 @@ static inline void rtc_enable_alarm(void); /**************************************************************************** * Name: rtc_dumpregs - * - * Description: - * Disable RTC write protection - * - * Input Parameters: - * None - * - * Returned Value: - * None - * ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO @@ -190,16 +180,6 @@ static void rtc_dumpregs(FAR const char *msg) /**************************************************************************** * Name: rtc_dumptime - * - * Description: - * Disable RTC write protection - * - * Input Parameters: - * None - * - * Returned Value: - * None - * ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO @@ -664,9 +644,7 @@ static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg) int isr; int ret = -EBUSY; - /* Need to allow RTC register write - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -709,9 +687,7 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg) int isr; int ret = -EBUSY; - /* Need to allow RTC register write - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -1467,9 +1443,7 @@ int stm32l4_rtc_cancelalarm(enum alm_id_e alarmid) g_alarmcb[alarmid].ac_cb = NULL; g_alarmcb[alarmid].ac_arg = NULL; - /* Need to follow RTC register wrote protection. - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock(); @@ -1500,9 +1474,7 @@ int stm32l4_rtc_cancelalarm(enum alm_id_e alarmid) g_alarmcb[alarmid].ac_cb = NULL; g_alarmcb[alarmid].ac_arg = NULL; - /* Need to follow RTC register wrote protection. - * Disable the write protection for RTC registers - */ + /* Disable the write protection for RTC registers */ rtc_wprunlock();