ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[xxx_F4XX] remove erasing of BkUpR in RTC API 

the erasing of back up register is only needed when using LSI in RTC API
pull/1643/head
dbestm 2016-04-01 11:39:51 +02:00
parent e42e174852
commit 31defa8bcd
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/rtc_api.c
View File

@ -50,16 +50,6 @@ void rtc_init(void)
RtcHandle.Instance = RTC; RtcHandle.Instance = RTC;
// Enable Power clock
__PWR_CLK_ENABLE();
// Enable access to Backup domain
HAL_PWR_EnableBkUpAccess();
// Reset Backup domain
__HAL_RCC_BACKUPRESET_FORCE();
__HAL_RCC_BACKUPRESET_RELEASE();
#if !DEVICE_RTC_LSI #if !DEVICE_RTC_LSI
// Enable LSE Oscillator // Enable LSE Oscillator
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE;
@ -75,19 +65,29 @@ void rtc_init(void)
error("RTC error: LSE clock initialization failed."); error("RTC error: LSE clock initialization failed.");
} }
#else #else
// Enable LSI clock // Enable Power clock
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE; __PWR_CLK_ENABLE();
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured!
RCC_OscInitStruct.LSEState = RCC_LSE_OFF; // Enable access to Backup domain
RCC_OscInitStruct.LSIState = RCC_LSI_ON; HAL_PWR_EnableBkUpAccess();
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
error("RTC error: LSI clock initialization failed."); // Reset Backup domain
} __HAL_RCC_BACKUPRESET_FORCE();
// Connect LSI to RTC __HAL_RCC_BACKUPRESET_RELEASE();
__HAL_RCC_RTC_CLKPRESCALER(RCC_RTCCLKSOURCE_LSI);
__HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSI); // Enable LSI clock
// [TODO] This value is LSI typical value. To be measured precisely using a timer input capture RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
rtc_freq = LSI_VALUE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured!
RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
RCC_OscInitStruct.LSIState = RCC_LSI_ON;
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
error("RTC error: LSI clock initialization failed.");
}
// Connect LSI to RTC
__HAL_RCC_RTC_CLKPRESCALER(RCC_RTCCLKSOURCE_LSI);
__HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSI);
// [TODO] This value is LSI typical value. To be measured precisely using a timer input capture
rtc_freq = LSI_VALUE;
#endif #endif
// Enable RTC // Enable RTC
@ -107,6 +107,7 @@ void rtc_init(void)
void rtc_free(void) void rtc_free(void)
{ {
#if DEVICE_RTC_LSI
// Enable Power clock // Enable Power clock
__PWR_CLK_ENABLE(); __PWR_CLK_ENABLE();
@ -119,6 +120,7 @@ void rtc_free(void)
// Disable access to Backup domain // Disable access to Backup domain
HAL_PWR_DisableBkUpAccess(); HAL_PWR_DisableBkUpAccess();
#endif
// Disable LSI and LSE clocks // Disable LSI and LSE clocks
RCC_OscInitTypeDef RCC_OscInitStruct; RCC_OscInitTypeDef RCC_OscInitStruct;