From b13e55da8c10479aa1d0086aacab52f52e2852de Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Mon, 18 Feb 2013 14:12:48 -0800 Subject: Adjusted code for l1 to the new api introduced by karlp in pr #84 --- .../stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c | 4 ++-- lib/stm32/l1/rcc.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c b/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c index 3f19319..6e4bb23 100644 --- a/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c +++ b/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c @@ -259,7 +259,7 @@ void reset_clocks(void) .ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV, .ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV, .voltage_scale = RANGE2, - .flash_config = FLASH_LATENCY_0WS, + .flash_config = FLASH_ACR_LATENCY_0WS, .apb1_frequency = 4194000, .apb2_frequency = 4194000, .msi_range = RCC_ICSCR_MSIRANGE_4MHZ, @@ -297,4 +297,4 @@ int main(void) } return 0; -} \ No newline at end of file +} diff --git a/lib/stm32/l1/rcc.c b/lib/stm32/l1/rcc.c index a6078c9..106032a 100644 --- a/lib/stm32/l1/rcc.c +++ b/lib/stm32/l1/rcc.c @@ -69,7 +69,7 @@ const clock_scale_t clock_config[CLOCK_CONFIG_END] = .ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV, .ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV, .voltage_scale = RANGE1, - .flash_config = FLASH_LATENCY_0WS, + .flash_config = FLASH_ACR_LATENCY_0WS, .apb1_frequency = 4000000, .apb2_frequency = 4000000, }, @@ -78,7 +78,7 @@ const clock_scale_t clock_config[CLOCK_CONFIG_END] = .ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV, .ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV, .voltage_scale = RANGE1, - .flash_config = FLASH_LATENCY_0WS, + .flash_config = FLASH_ACR_LATENCY_0WS, .apb1_frequency = 4194000, .apb2_frequency = 4194000, .msi_range = RCC_ICSCR_MSIRANGE_4MHZ, @@ -88,7 +88,7 @@ const clock_scale_t clock_config[CLOCK_CONFIG_END] = .ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV, .ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV, .voltage_scale = RANGE1, - .flash_config = FLASH_LATENCY_0WS, + .flash_config = FLASH_ACR_LATENCY_0WS, .apb1_frequency = 2097000, .apb2_frequency = 2097000, .msi_range = RCC_ICSCR_MSIRANGE_2MHZ, -- cgit v1.2.3