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

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6163 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2013-08-16 08:14:51 +00:00
parent 4357e72857
commit ecd12dd557
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
os/hal/platforms/STM32F4xx/hal_lld.c
View File

@ -53,7 +53,6 @@ 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.*/
@ -61,7 +60,13 @@ static void hal_lld_backup_domain_init(void) {
RCC->BDCR = 0; RCC->BDCR = 0;
} }
#if STM32_RTCSEL != STM32_RTCSEL_NOCLOCK #if STM32_LSE_ENABLED
RCC->BDCR |= RCC_BDCR_LSEON;
while ((RCC->BDCR & RCC_BDCR_LSERDY) == 0)
; /* Waits until LSE is stable. */
#endif
#if HAL_USE_RTC
/* If the backup domain hasn't been initialized yet then proceed with /* If the backup domain hasn't been initialized yet then proceed with
initialization.*/ initialization.*/
if ((RCC->BDCR & RCC_BDCR_RTCEN) == 0) { if ((RCC->BDCR & RCC_BDCR_RTCEN) == 0) {
@ -71,7 +76,6 @@ static void hal_lld_backup_domain_init(void) {
/* RTC clock enabled.*/ /* RTC clock enabled.*/
RCC->BDCR |= RCC_BDCR_RTCEN; RCC->BDCR |= RCC_BDCR_RTCEN;
} }
#endif /* STM32_RTCSEL != STM32_RTCSEL_NOCLOCK */
#endif /* HAL_USE_RTC */ #endif /* HAL_USE_RTC */
#if STM32_BKPRAM_ENABLE #if STM32_BKPRAM_ENABLE
@ -182,17 +186,6 @@ void stm32_clock_init(void) {
; /* Waits until LSI is stable. */ ; /* Waits until LSI is stable. */
#endif #endif
#if STM32_LSE_ENABLED
/* LSE activation, have to unlock the register.*/
if ((RCC->BDCR & RCC_BDCR_LSEON) == 0) {
PWR->CR |= PWR_CR_DBP;
RCC->BDCR |= RCC_BDCR_LSEON;
PWR->CR &= ~PWR_CR_DBP;
}
while ((RCC->BDCR & RCC_BDCR_LSERDY) == 0)
; /* Waits until LSE is stable. */
#endif
#if STM32_ACTIVATE_PLL #if STM32_ACTIVATE_PLL
/* PLL activation.*/ /* PLL activation.*/
RCC->PLLCFGR = STM32_PLLQ | STM32_PLLSRC | STM32_PLLP | STM32_PLLN | RCC->PLLCFGR = STM32_PLLQ | STM32_PLLSRC | STM32_PLLP | STM32_PLLN |

1
readme.txt
View File

@ -114,6 +114,7 @@
(backported to 2.6.0). (backported to 2.6.0).
- FIX: Fixed MS2ST() and US2ST() macros error (bug #415)(backported to 2.6.0, - FIX: Fixed MS2ST() and US2ST() macros error (bug #415)(backported to 2.6.0,
2.4.4, 2.2.10, NilRTOS). 2.4.4, 2.2.10, NilRTOS).
- NEW: Improvements to the STM32F4xx backup domain initialization.
- NEW: Added initializer for the DIER register to the STM32 GPT, ICU and - NEW: Added initializer for the DIER register to the STM32 GPT, ICU and
PWM drivers. PWM drivers.
- NEW: Added support for 32bits counters to the STM32 GPT driver. - NEW: Added support for 32bits counters to the STM32 GPT driver.