zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RTCv1. Fixed unneded RTC initialization when HAL_USE_RTC disabled (bug 3594620). 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4899 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
barthess 2012-12-10 19:58:55 +00:00
parent 344fad1995
commit beb5f4e03e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os/hal/platforms/STM32F1xx/hal_lld.c
View File

@ -51,6 +51,7 @@ static void hal_lld_backup_domain_init(void) {
/* Backup domain access enabled and left open.*/ /* Backup domain access enabled and left open.*/
PWR->CR |= PWR_CR_DBP; PWR->CR |= PWR_CR_DBP;
#if HAL_USE_RTC
/* Reset BKP domain if different clock source selected.*/ /* Reset BKP domain if different clock source selected.*/
if ((RCC->BDCR & STM32_RTCSEL_MASK) != STM32_RTCSEL){ if ((RCC->BDCR & STM32_RTCSEL_MASK) != STM32_RTCSEL){
/* Backup domain reset.*/ /* Backup domain reset.*/
@ -63,7 +64,7 @@ static void hal_lld_backup_domain_init(void) {
RCC->BDCR |= RCC_BDCR_LSEON; RCC->BDCR |= RCC_BDCR_LSEON;
while ((RCC->BDCR & RCC_BDCR_LSERDY) == 0) while ((RCC->BDCR & RCC_BDCR_LSERDY) == 0)
; /* Waits until LSE is stable. */ ; /* Waits until LSE is stable. */
#endif #endif /* STM32_LSE_ENABLED */
#if STM32_RTCSEL != STM32_RTCSEL_NOCLOCK #if STM32_RTCSEL != STM32_RTCSEL_NOCLOCK
/* If the backup domain hasn't been initialized yet then proceed with /* If the backup domain hasn't been initialized yet then proceed with
@ -76,11 +77,10 @@ static void hal_lld_backup_domain_init(void) {
RCC->BDCR |= RCC_BDCR_RTCEN; RCC->BDCR |= RCC_BDCR_RTCEN;
/* Prescaler value loaded in registers.*/ /* Prescaler value loaded in registers.*/
#if HAL_USE_RTC
rtc_lld_set_prescaler(); rtc_lld_set_prescaler();
#endif /* HAL_USE_RTC */
} }
#endif /* STM32_RTCSEL != STM32_RTCSEL_NOCLOCK */ #endif /* STM32_RTCSEL != STM32_RTCSEL_NOCLOCK */
#endif /* HAL_USE_RTC */
} }
/*===========================================================================*/ /*===========================================================================*/

2
readme.txt
View File

@ -82,6 +82,8 @@
***************************************************************************** *****************************************************************************
*** 2.5.1 *** *** 2.5.1 ***
- FIX: Unneded RTC initialization when HAL_USE_RTC disabled (bug 3594620)
(backported to 2.4.3).
- FIX: Compilation issue with HAL_USE_RTC disabled (bug 3594083) (backported - FIX: Compilation issue with HAL_USE_RTC disabled (bug 3594083) (backported
to 2.4.3). to 2.4.3).
- FIX: Wasting of BKP registers in RTCv1 driver (bug 3594005) (backported - FIX: Wasting of BKP registers in RTCv1 driver (bug 3594005) (backported