From 9053d3b9ea57ac0d36b5fcd5e854dadb75f184f6 Mon Sep 17 00:00:00 2001 From: svastm Date: Mon, 26 Sep 2016 16:46:03 +0200 Subject: [PATCH 1/9] STM32F0 - Rename RTC_LSI --- hal/targets.json | 4 ++-- .../hal/TARGET_STM/TARGET_STM32F0/rtc_api.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hal/targets.json b/hal/targets.json index dffaa479ba..f9b44c5658 100644 --- a/hal/targets.json +++ b/hal/targets.json @@ -624,7 +624,7 @@ "core": "Cortex-M0", "default_toolchain": "uARM", "extra_labels": ["STM", "STM32F0", "STM32F031K6"], - "macros": ["DEVICE_RTC_LSI=1"], + "macros": ["RTC_LSI=1"], "supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"], "inherits": ["Target"], "progen": {"target": "nucleo-f031k6"}, @@ -638,7 +638,7 @@ "core": "Cortex-M0", "default_toolchain": "uARM", "extra_labels": ["STM", "STM32F0", "STM32F042K6"], - "macros": ["DEVICE_RTC_LSI=1"], + "macros": ["RTC_LSI=1"], "supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"], "inherits": ["Target"], "progen": {"target": "nucleo-f042k6"}, diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F0/rtc_api.c b/hal/targets/hal/TARGET_STM/TARGET_STM32F0/rtc_api.c index bf0a38fca2..bf6724c297 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32F0/rtc_api.c +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32F0/rtc_api.c @@ -34,13 +34,13 @@ #include "mbed_error.h" -#if DEVICE_RTC_LSI +#if RTC_LSI static int rtc_inited = 0; #endif static RTC_HandleTypeDef RtcHandle; -#if DEVICE_RTC_LSI +#if RTC_LSI #define RTC_CLOCK LSI_VALUE #else #define RTC_CLOCK LSE_VALUE @@ -62,14 +62,14 @@ static RTC_HandleTypeDef RtcHandle; void rtc_init(void) { RCC_OscInitTypeDef RCC_OscInitStruct; -#if DEVICE_RTC_LSI +#if RTC_LSI if (rtc_inited) return; rtc_inited = 1; #endif RtcHandle.Instance = RTC; -#if !DEVICE_RTC_LSI +#if !RTC_LSI // Enable LSE Oscillator RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured! @@ -119,7 +119,7 @@ void rtc_init(void) { } #if DEVICE_LOWPOWERTIMER -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_write(0); #else if (!rtc_isenabled()) { @@ -134,7 +134,7 @@ void rtc_init(void) { } void rtc_free(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI // Enable Power clock __PWR_CLK_ENABLE(); @@ -157,13 +157,13 @@ void rtc_free(void) { RCC_OscInitStruct.LSEState = RCC_LSE_OFF; HAL_RCC_OscConfig(&RCC_OscInitStruct); -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_inited = 0; #endif } int rtc_isenabled(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI return rtc_inited; #else if ((RTC->ISR & RTC_ISR_INITS) == RTC_ISR_INITS) { From a4db938b7ac81a806970980847ff00771e75ce9d Mon Sep 17 00:00:00 2001 From: svastm Date: Mon, 26 Sep 2016 16:53:56 +0200 Subject: [PATCH 2/9] STM32F1 - Rename RTC_LSI --- hal/targets/hal/TARGET_STM/TARGET_STM32F1/rtc_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F1/rtc_api.c b/hal/targets/hal/TARGET_STM/TARGET_STM32F1/rtc_api.c index b5594504b6..82c527a058 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32F1/rtc_api.c +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32F1/rtc_api.c @@ -46,7 +46,7 @@ void rtc_init(void) RtcHandle.Instance = RTC; -#if !DEVICE_RTC_LSI +#if !RTC_LSI // Enable LSE Oscillator RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured! @@ -94,7 +94,7 @@ void rtc_init(void) void rtc_free(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI // Enable Power clock __PWR_CLK_ENABLE(); From 574e7b7622787c1816c220cbad49fe6a08d11e3d Mon Sep 17 00:00:00 2001 From: svastm Date: Mon, 26 Sep 2016 16:54:38 +0200 Subject: [PATCH 3/9] STM32F2 - Rename RTC_LSI --- hal/targets/hal/TARGET_STM/TARGET_STM32F2/rtc_api.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F2/rtc_api.c b/hal/targets/hal/TARGET_STM/TARGET_STM32F2/rtc_api.c index fadcfd89c7..563d5391e8 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32F2/rtc_api.c +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32F2/rtc_api.c @@ -33,7 +33,7 @@ #include "mbed_error.h" -#if DEVICE_RTC_LSI +#if RTC_LSI static int rtc_inited = 0; #endif @@ -44,13 +44,13 @@ void rtc_init(void) RCC_OscInitTypeDef RCC_OscInitStruct; uint32_t rtc_freq = 0; -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_inited = 1; #endif RtcHandle.Instance = RTC; -#if !DEVICE_RTC_LSI +#if !RTC_LSI // Enable LSE Oscillator RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; /* Mandatory, otherwise the PLL is reconfigured! */ @@ -106,7 +106,7 @@ void rtc_init(void) void rtc_free(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI // Enable Power clock __PWR_CLK_ENABLE(); @@ -128,14 +128,14 @@ void rtc_free(void) RCC_OscInitStruct.LSIState = RCC_LSI_OFF; RCC_OscInitStruct.LSEState = RCC_LSE_OFF; HAL_RCC_OscConfig(&RCC_OscInitStruct); -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_inited = 0; #endif } int rtc_isenabled(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI return rtc_inited; #else if ((RTC->ISR & RTC_ISR_INITS) == RTC_ISR_INITS) { From faae46385fe20a1f843d5319ecb87272e344dabb Mon Sep 17 00:00:00 2001 From: svastm Date: Mon, 26 Sep 2016 16:52:59 +0200 Subject: [PATCH 4/9] STM32F3 - Rename RTC_LSI --- hal/targets.json | 10 +++++----- .../hal/TARGET_STM/TARGET_STM32F3/rtc_api.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hal/targets.json b/hal/targets.json index f9b44c5658..39a16c38cf 100644 --- a/hal/targets.json +++ b/hal/targets.json @@ -726,7 +726,7 @@ "core": "Cortex-M4F", "default_toolchain": "ARM", "extra_labels": ["STM", "STM32F3", "STM32F303K8"], - "macros": ["DEVICE_RTC_LSI=1"], + "macros": ["RTC_LSI=1"], "supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"], "inherits": ["Target"], "progen": {"target": "nucleo-f303k8"}, @@ -1041,20 +1041,20 @@ "core": "Cortex-M4F", "default_toolchain": "ARM", "extra_labels": ["STM", "STM32F3", "STM32F303", "STM32F303VC"], - "macros": ["DEVICE_RTC_LSI=1"], + "macros": ["RTC_LSI=1"], "supported_toolchains": ["GCC_ARM"], - "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"] + "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"] }, "DISCO_F334C8": { "inherits": ["Target"], "core": "Cortex-M4F", "default_toolchain": "ARM", "extra_labels": ["STM", "STM32F3", "STM32F334C8"], - "macros": ["DEVICE_RTC_LSI=1"], + "macros": ["RTC_LSI=1"], "supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"], "progen": {"target": "disco-f334c8"}, "detect_code": ["0810"], - "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], + "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], "default_lib": "small", "release_versions": ["2"] }, diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F3/rtc_api.c b/hal/targets/hal/TARGET_STM/TARGET_STM32F3/rtc_api.c index 08f51f7a57..c82d6f1ec0 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32F3/rtc_api.c +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32F3/rtc_api.c @@ -34,13 +34,13 @@ #include "mbed_error.h" -#if DEVICE_RTC_LSI +#if RTC_LSI static int rtc_inited = 0; #endif static RTC_HandleTypeDef RtcHandle; -#if DEVICE_RTC_LSI +#if RTC_LSI #define RTC_CLOCK LSI_VALUE #else #define RTC_CLOCK LSE_VALUE @@ -63,14 +63,14 @@ void rtc_init(void) { RCC_OscInitTypeDef RCC_OscInitStruct; -#if DEVICE_RTC_LSI +#if RTC_LSI if (rtc_inited) return; rtc_inited = 1; #endif RtcHandle.Instance = RTC; -#if !DEVICE_RTC_LSI +#if !RTC_LSI // Enable LSE Oscillator RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; /* Mandatory, otherwise the PLL is reconfigured! */ @@ -119,7 +119,7 @@ void rtc_init(void) } #if DEVICE_LOWPOWERTIMER -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_write(0); #else if (!rtc_isenabled()) { @@ -135,7 +135,7 @@ void rtc_init(void) void rtc_free(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI // Enable Power clock __PWR_CLK_ENABLE(); @@ -158,14 +158,14 @@ void rtc_free(void) RCC_OscInitStruct.LSEState = RCC_LSE_OFF; HAL_RCC_OscConfig(&RCC_OscInitStruct); -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_inited = 0; #endif } int rtc_isenabled(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI return rtc_inited; #else if ((RTC->ISR & RTC_ISR_INITS) == RTC_ISR_INITS) return 1; From a0fd0d39c1d3914602d43314aa1d8e41dd968c00 Mon Sep 17 00:00:00 2001 From: svastm Date: Thu, 29 Sep 2016 09:58:58 +0200 Subject: [PATCH 5/9] STM32F4 - Rename RTC_LSI --- hal/targets.json | 6 +++--- .../hal/TARGET_STM/TARGET_STM32F4/rtc_api.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hal/targets.json b/hal/targets.json index 39a16c38cf..4c13c83fb2 100644 --- a/hal/targets.json +++ b/hal/targets.json @@ -832,8 +832,8 @@ "extra_labels": ["STM", "STM32F4", "STM32F429", "STM32F429ZI", "STM32F429xx"], "supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"], "progen": {"target": "nucleo-f429zi"}, - "macros": ["DEVICE_RTC_LSI=1", "TRANSACTION_QUEUE_SIZE_SPI=2"], - "device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "TRNG"], + "macros": ["RTC_LSI=1", "TRANSACTION_QUEUE_SIZE_SPI=2"], + "device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "TRNG"], "detect_code": ["0796"], "features": ["IPV4"], "release_versions": ["2", "5"] @@ -1072,7 +1072,7 @@ "core": "Cortex-M4F", "default_toolchain": "ARM", "extra_labels": ["STM", "STM32F4", "STM32F429", "STM32F429ZI", "STM32F429xx"], - "macros": ["DEVICE_RTC_LSI=1","TRANSACTION_QUEUE_SIZE_SPI=2"], + "macros": ["RTC_LSI=1","TRANSACTION_QUEUE_SIZE_SPI=2"], "supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"], "progen": {"target": "disco-f429zi"}, "device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "TRNG"], diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F4/rtc_api.c b/hal/targets/hal/TARGET_STM/TARGET_STM32F4/rtc_api.c index 6770b78767..6e126d0ce2 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32F4/rtc_api.c +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32F4/rtc_api.c @@ -34,13 +34,13 @@ #include "mbed_error.h" -#if DEVICE_RTC_LSI +#if RTC_LSI static int rtc_inited = 0; #endif static RTC_HandleTypeDef RtcHandle; -#if DEVICE_RTC_LSI +#if RTC_LSI #define RTC_CLOCK LSI_VALUE #else #define RTC_CLOCK LSE_VALUE @@ -63,14 +63,14 @@ void rtc_init(void) { RCC_OscInitTypeDef RCC_OscInitStruct; -#if DEVICE_RTC_LSI +#if RTC_LSI if (rtc_inited) return; rtc_inited = 1; #endif RtcHandle.Instance = RTC; -#if !DEVICE_RTC_LSI +#if !RTC_LSI // Enable LSE Oscillator RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; /* Mandatory, otherwise the PLL is reconfigured! */ @@ -121,7 +121,7 @@ void rtc_init(void) } #if DEVICE_LOWPOWERTIMER -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_write(0); #else if (!rtc_isenabled()) { @@ -137,7 +137,7 @@ void rtc_init(void) void rtc_free(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI // Enable Power clock __PWR_CLK_ENABLE(); @@ -160,14 +160,14 @@ void rtc_free(void) RCC_OscInitStruct.LSEState = RCC_LSE_OFF; HAL_RCC_OscConfig(&RCC_OscInitStruct); -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_inited = 0; #endif } int rtc_isenabled(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI return rtc_inited; #else if ((RTC->ISR & RTC_ISR_INITS) == RTC_ISR_INITS) return 1; From 57208bb6513e6e07a90ab99aeb93d4cc7a7eb35f Mon Sep 17 00:00:00 2001 From: svastm Date: Tue, 27 Sep 2016 11:25:12 +0200 Subject: [PATCH 6/9] STM32F7 - Rename RTC_LSI --- .../hal/TARGET_STM/TARGET_STM32F7/rtc_api.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F7/rtc_api.c b/hal/targets/hal/TARGET_STM/TARGET_STM32F7/rtc_api.c index d4783aa750..40e7ede75f 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32F7/rtc_api.c +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32F7/rtc_api.c @@ -34,13 +34,13 @@ #include "mbed_error.h" -#if DEVICE_RTC_LSI +#if RTC_LSI static int rtc_inited = 0; #endif static RTC_HandleTypeDef RtcHandle; -#if DEVICE_RTC_LSI +#if RTC_LSI #define RTC_CLOCK LSI_VALUE #else #define RTC_CLOCK LSE_VALUE @@ -63,14 +63,14 @@ void rtc_init(void) { RCC_OscInitTypeDef RCC_OscInitStruct; -#if DEVICE_RTC_LSI +#if RTC_LSI if (rtc_inited) return; rtc_inited = 1; #endif RtcHandle.Instance = RTC; -#if !DEVICE_RTC_LSI +#if !RTC_LSI // Enable LSE Oscillator RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured! @@ -122,7 +122,7 @@ void rtc_init(void) } #if DEVICE_LOWPOWERTIMER -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_write(0); #else if (!rtc_isenabled()) { @@ -138,7 +138,7 @@ void rtc_init(void) void rtc_free(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI // Enable Power clock __PWR_CLK_ENABLE(); @@ -161,14 +161,14 @@ void rtc_free(void) RCC_OscInitStruct.LSEState = RCC_LSE_OFF; HAL_RCC_OscConfig(&RCC_OscInitStruct); -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_inited = 0; #endif } int rtc_isenabled(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI return rtc_inited; #else if ((RTC->ISR & RTC_ISR_INITS) == RTC_ISR_INITS) { From da44e99a1c7e7e3d4d84ab6b52bb7e2d0c15fecb Mon Sep 17 00:00:00 2001 From: svastm Date: Tue, 27 Sep 2016 11:26:43 +0200 Subject: [PATCH 7/9] STM32L0 - Rename RTC_LSI --- .../hal/TARGET_STM/TARGET_STM32L0/rtc_api.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32L0/rtc_api.c b/hal/targets/hal/TARGET_STM/TARGET_STM32L0/rtc_api.c index b8f2f445a8..82f4c055e0 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32L0/rtc_api.c +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32L0/rtc_api.c @@ -34,13 +34,13 @@ #include "mbed_error.h" -#if DEVICE_RTC_LSI +#if RTC_LSI static int rtc_inited = 0; #endif static RTC_HandleTypeDef RtcHandle; -#if DEVICE_RTC_LSI +#if RTC_LSI #define RTC_CLOCK LSI_VALUE #else #define RTC_CLOCK LSE_VALUE @@ -64,7 +64,7 @@ void rtc_init(void) RCC_OscInitTypeDef RCC_OscInitStruct; RCC_PeriphCLKInitTypeDef PeriphClkInitStruct; -#if DEVICE_RTC_LSI +#if RTC_LSI if (rtc_inited) return; rtc_inited = 1; #endif @@ -79,7 +79,7 @@ void rtc_init(void) // Enable access to Backup domain HAL_PWR_EnableBkUpAccess(); -#if !DEVICE_RTC_LSI +#if !RTC_LSI // Enable LSE Oscillator RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured! @@ -129,7 +129,7 @@ void rtc_init(void) } #if DEVICE_LOWPOWERTIMER -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_write(0); #else if (!rtc_isenabled()) { @@ -145,7 +145,7 @@ void rtc_init(void) void rtc_free(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI // Enable Power clock __PWR_CLK_ENABLE(); @@ -168,14 +168,14 @@ void rtc_free(void) RCC_OscInitStruct.LSEState = RCC_LSE_OFF; HAL_RCC_OscConfig(&RCC_OscInitStruct); -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_inited = 0; #endif } int rtc_isenabled(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI return rtc_inited; #else if ((RTC->ISR & RTC_ISR_INITS) == RTC_ISR_INITS) { From f361a430ef9166b2521f0b32d1b812b0628a1d96 Mon Sep 17 00:00:00 2001 From: svastm Date: Mon, 26 Sep 2016 16:47:52 +0200 Subject: [PATCH 8/9] STM32L1 - Rename RTC_LSI --- hal/targets.json | 4 ++-- .../hal/TARGET_STM/TARGET_STM32L1/rtc_api.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hal/targets.json b/hal/targets.json index 4c13c83fb2..fc03fb2c46 100644 --- a/hal/targets.json +++ b/hal/targets.json @@ -1192,7 +1192,7 @@ "core": "Cortex-M3", "default_toolchain": "uARM", "extra_labels": ["STM", "STM32L1", "STM32L152RC"], - "macros": ["DEVICE_RTC_LSI=1"], + "macros": ["RTC_LSI=1"], "supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"], "progen": {"target": "stm32l151rc"}, "detect_code": ["4100"], @@ -1227,7 +1227,7 @@ "default_toolchain": "uARM", "program_cycle_s": 1.5, "extra_labels": ["STM", "STM32L1", "STM32L151RC"], - "macros": ["DEVICE_RTC_LSI=1"], + "macros": ["RTC_LSI=1"], "supported_toolchains": ["ARM", "uARM", "GCC_ARM"], "progen": {"target": "stm32l151rc"}, "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32L1/rtc_api.c b/hal/targets/hal/TARGET_STM/TARGET_STM32L1/rtc_api.c index 3bcde9b584..612ff04c73 100755 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32L1/rtc_api.c +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32L1/rtc_api.c @@ -34,13 +34,13 @@ #include "mbed_error.h" -#if DEVICE_RTC_LSI +#if RTC_LSI static int rtc_inited = 0; #endif static RTC_HandleTypeDef RtcHandle; -#if DEVICE_RTC_LSI +#if RTC_LSI #define RTC_CLOCK LSI_VALUE #else #define RTC_CLOCK LSE_VALUE @@ -63,14 +63,14 @@ void rtc_init(void) { RCC_OscInitTypeDef RCC_OscInitStruct; -#if DEVICE_RTC_LSI +#if RTC_LSI if (rtc_inited) return; rtc_inited = 1; #endif RtcHandle.Instance = RTC; -#if !DEVICE_RTC_LSI +#if !RTC_LSI // Enable LSE Oscillator RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured! @@ -128,7 +128,7 @@ void rtc_init(void) } #if DEVICE_LOWPOWERTIMER -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_write(0); #else if (!rtc_isenabled()) { @@ -144,7 +144,7 @@ void rtc_init(void) void rtc_free(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI // Enable Power clock __PWR_CLK_ENABLE(); @@ -167,14 +167,14 @@ void rtc_free(void) RCC_OscInitStruct.LSEState = RCC_LSE_OFF; HAL_RCC_OscConfig(&RCC_OscInitStruct); -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_inited = 0; #endif } int rtc_isenabled(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI return rtc_inited; #else if ((RTC->ISR & RTC_ISR_INITS) == RTC_ISR_INITS) { From d37e4d876df8889db8493aa3078ddb3215245f5c Mon Sep 17 00:00:00 2001 From: svastm Date: Mon, 26 Sep 2016 16:50:56 +0200 Subject: [PATCH 9/9] STM32L4 - Rename RTC_LSI --- .../hal/TARGET_STM/TARGET_STM32L4/rtc_api.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32L4/rtc_api.c b/hal/targets/hal/TARGET_STM/TARGET_STM32L4/rtc_api.c index 2581c236cd..c34d806f71 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32L4/rtc_api.c +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32L4/rtc_api.c @@ -34,13 +34,13 @@ #include "mbed_error.h" -#if DEVICE_RTC_LSI +#if RTC_LSI static int rtc_inited = 0; #endif static RTC_HandleTypeDef RtcHandle; -#if DEVICE_RTC_LSI +#if RTC_LSI #define RTC_CLOCK LSI_VALUE #else #define RTC_CLOCK LSE_VALUE @@ -64,14 +64,14 @@ void rtc_init(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; -#if DEVICE_RTC_LSI +#if RTC_LSI if (rtc_inited) return; rtc_inited = 1; #endif RtcHandle.Instance = RTC; -#if !DEVICE_RTC_LSI +#if !RTC_LSI // Enable LSE Oscillator RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured! @@ -130,7 +130,7 @@ void rtc_init(void) } #if DEVICE_LOWPOWERTIMER -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_write(0); #else if (!rtc_isenabled()) { @@ -146,7 +146,7 @@ void rtc_init(void) void rtc_free(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI // Enable Power clock __HAL_RCC_PWR_CLK_ENABLE(); @@ -169,14 +169,14 @@ void rtc_free(void) RCC_OscInitStruct.LSEState = RCC_LSE_OFF; HAL_RCC_OscConfig(&RCC_OscInitStruct); -#if DEVICE_RTC_LSI +#if RTC_LSI rtc_inited = 0; #endif } int rtc_isenabled(void) { -#if DEVICE_RTC_LSI +#if RTC_LSI return rtc_inited; #else if ((RTC->ISR & RTC_ISR_INITS) == RTC_ISR_INITS) {