From c0ea74945223df7a40150fbe86d82963942a89bb Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Wed, 23 Jan 2013 12:54:17 +0000 Subject: [flash] l1: use "proper" bit definition naming. Part 1 of 4: updated l1 to use flash__bit instead of just flash_bit --- lib/stm32/l1/flash.c | 8 ++++---- lib/stm32/l1/rcc.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/stm32/l1') diff --git a/lib/stm32/l1/flash.c b/lib/stm32/l1/flash.c index 06e8a59..7b20f69 100644 --- a/lib/stm32/l1/flash.c +++ b/lib/stm32/l1/flash.c @@ -23,22 +23,22 @@ void flash_64bit_enable(void) { - FLASH_ACR |= FLASH_ACC64; + FLASH_ACR |= FLASH_ACR_ACC64; } void flash_64bit_disable(void) { - FLASH_ACR &= ~FLASH_ACC64; + FLASH_ACR &= ~FLASH_ACR_ACC64; } void flash_prefetch_enable(void) { - FLASH_ACR |= FLASH_PRFTEN; + FLASH_ACR |= FLASH_ACR_PRFTEN; } void flash_prefetch_disable(void) { - FLASH_ACR &= ~FLASH_PRFTEN; + FLASH_ACR &= ~FLASH_ACR_PRFTEN; } void flash_set_ws(u32 ws) diff --git a/lib/stm32/l1/rcc.c b/lib/stm32/l1/rcc.c index bbba9a9..c06a727 100644 --- a/lib/stm32/l1/rcc.c +++ b/lib/stm32/l1/rcc.c @@ -39,7 +39,7 @@ const clock_scale_t clock_vrange1_config[CLOCK_VRANGE1_END] = .ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV, .ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV, .voltage_scale = RANGE1, - .flash_config = FLASH_LATENCY_1WS, + .flash_config = FLASH_ACR_LATENCY_1WS, .apb1_frequency = 24000000, .apb2_frequency = 24000000, }, @@ -51,7 +51,7 @@ const clock_scale_t clock_vrange1_config[CLOCK_VRANGE1_END] = .ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV, .ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV, .voltage_scale = RANGE1, - .flash_config = FLASH_LATENCY_1WS, + .flash_config = FLASH_ACR_LATENCY_1WS, .apb1_frequency = 32000000, .apb2_frequency = 32000000, }, @@ -60,7 +60,7 @@ const clock_scale_t clock_vrange1_config[CLOCK_VRANGE1_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 = 16000000, .apb2_frequency = 16000000, }, -- cgit v1.2.3