From 99f83eedcd1fe02cbebbe55ced496313815323d2 Mon Sep 17 00:00:00 2001 From: Chuck McManis Date: Wed, 26 Nov 2014 16:59:30 -0800 Subject: [PATCH] stm32/f0: rcc.c Use common version instead of duplicate code. Pulls out duplicate calls from f0/rcc.c and uses the common version which also means that f0 can use rcc_peripheral_enable() now which is in common but not the old rcc versions. --- include/libopencm3/stm32/f0/rcc.h | 7 ++----- lib/stm32/f0/Makefile | 2 +- lib/stm32/f0/rcc.c | 33 ------------------------------- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/include/libopencm3/stm32/f0/rcc.h b/include/libopencm3/stm32/f0/rcc.h index 39de15e7..231587f6 100644 --- a/include/libopencm3/stm32/f0/rcc.h +++ b/include/libopencm3/stm32/f0/rcc.h @@ -483,6 +483,8 @@ enum rcc_periph_rst { /* API Functions */ /*****************************************************************************/ +#include + BEGIN_DECLS void rcc_osc_ready_int_clear(enum rcc_osc osc); @@ -511,11 +513,6 @@ void rcc_clock_setup_in_hsi_out_24mhz(void); void rcc_clock_setup_in_hsi_out_32mhz(void); void rcc_clock_setup_in_hsi_out_40mhz(void); void rcc_clock_setup_in_hsi_out_48mhz(void); -void rcc_periph_clock_enable(enum rcc_periph_clken periph); -void rcc_periph_clock_disable(enum rcc_periph_clken periph); -void rcc_periph_reset_pulse(enum rcc_periph_rst periph); -void rcc_periph_reset_hold(enum rcc_periph_rst periph); -void rcc_periph_reset_release(enum rcc_periph_rst periph); END_DECLS diff --git a/lib/stm32/f0/Makefile b/lib/stm32/f0/Makefile index 156171c9..8003ff61 100644 --- a/lib/stm32/f0/Makefile +++ b/lib/stm32/f0/Makefile @@ -41,7 +41,7 @@ OBJS += gpio_common_all.o gpio_common_f0234.o crc_common_all.o \ pwr_common_all.o iwdg_common_all.o rtc_common_l1f024.o \ dma_common_l1f013.o exti_common_all.o spi_common_all.o \ spi_common_f03.o flash_common_f01.o dac_common_all.o \ - timer_common_all.o + timer_common_all.o rcc_common_all.o VPATH += ../../usb:../:../../cm3:../common diff --git a/lib/stm32/f0/rcc.c b/lib/stm32/f0/rcc.c index 1f37133a..b14459be 100644 --- a/lib/stm32/f0/rcc.c +++ b/lib/stm32/f0/rcc.c @@ -628,38 +628,5 @@ void rcc_clock_setup_in_hsi_out_48mhz(void) rcc_core_frequency = 48000000; } - -#define _RCC_REG(i) MMIO32(RCC_BASE + ((i) >> 5)) -#define _RCC_BIT(i) (1 << ((i) & 0x1f)) - -void rcc_periph_clock_enable(enum rcc_periph_clken periph) -{ - _RCC_REG(periph) |= _RCC_BIT(periph); -} - -void rcc_periph_clock_disable(enum rcc_periph_clken periph) -{ - _RCC_REG(periph) &= ~_RCC_BIT(periph); -} - -void rcc_periph_reset_pulse(enum rcc_periph_rst periph) -{ - _RCC_REG(periph) |= _RCC_BIT(periph); - _RCC_REG(periph) &= ~_RCC_BIT(periph); -} - -void rcc_periph_reset_hold(enum rcc_periph_rst periph) -{ - _RCC_REG(periph) |= _RCC_BIT(periph); -} - -void rcc_periph_reset_release(enum rcc_periph_rst periph) -{ - _RCC_REG(periph) &= ~_RCC_BIT(periph); -} - -#undef _RCC_REG -#undef _RCC_BIT - /**@}*/