EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stm32/f0: rcc.c Use common version instead of duplicate code.

Browse Source 
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.
This commit is contained in:
Chuck McManis
2014-11-26 16:59:30 -08:00
committed by Karl Palsson
parent f51698fff4
commit 99f83eedcd
3 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/libopencm3/stm32/f0/rcc.h
View File

@@ -483,6 +483,8 @@ enum rcc_periph_rst {
/* API Functions */ /* API Functions */
/*****************************************************************************/ /*****************************************************************************/
#include <libopencm3/stm32/common/rcc_common_all.h>
BEGIN_DECLS BEGIN_DECLS
void rcc_osc_ready_int_clear(enum rcc_osc osc); 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_32mhz(void);
void rcc_clock_setup_in_hsi_out_40mhz(void); void rcc_clock_setup_in_hsi_out_40mhz(void);
void rcc_clock_setup_in_hsi_out_48mhz(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 END_DECLS

2
lib/stm32/f0/Makefile
View File

@@ -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 \ pwr_common_all.o iwdg_common_all.o rtc_common_l1f024.o \
dma_common_l1f013.o exti_common_all.o spi_common_all.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 \ 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 VPATH += ../../usb:../:../../cm3:../common

33
lib/stm32/f0/rcc.c
View File

@@ -628,38 +628,5 @@ void rcc_clock_setup_in_hsi_out_48mhz(void)
rcc_core_frequency = 48000000; 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
/**@}*/ /**@}*/