From 4eb51ecaea7c3215f8da56b5ed10867a80d2ef18 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Tue, 16 Aug 2016 17:46:50 +0000 Subject: [PATCH] stm32: rcc: rcc_wait_for_osc_ready is always available Move the prototype to the common_all header and include documentation. --- include/libopencm3/stm32/common/rcc_common_all.h | 7 +++++++ include/libopencm3/stm32/f0/rcc.h | 1 - include/libopencm3/stm32/f1/rcc.h | 1 - include/libopencm3/stm32/f2/rcc.h | 1 - include/libopencm3/stm32/f3/rcc.h | 1 - include/libopencm3/stm32/f4/rcc.h | 1 - include/libopencm3/stm32/l0/rcc.h | 1 - include/libopencm3/stm32/l1/rcc.h | 1 - include/libopencm3/stm32/l4/rcc.h | 1 - 9 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/libopencm3/stm32/common/rcc_common_all.h b/include/libopencm3/stm32/common/rcc_common_all.h index 96ea5e0a..7a9fa520 100644 --- a/include/libopencm3/stm32/common/rcc_common_all.h +++ b/include/libopencm3/stm32/common/rcc_common_all.h @@ -51,6 +51,13 @@ void rcc_periph_reset_release(enum rcc_periph_rst rst); void rcc_set_mco(uint32_t mcosrc); +/** + * Wait for Oscillator Ready. + * Block until the hardware indicates that the Oscillator is ready. + * @param osc Oscillator ID + */ +void rcc_wait_for_osc_ready(enum rcc_osc osc); + END_DECLS /**@}*/ diff --git a/include/libopencm3/stm32/f0/rcc.h b/include/libopencm3/stm32/f0/rcc.h index 8e407685..6d502e8b 100644 --- a/include/libopencm3/stm32/f0/rcc.h +++ b/include/libopencm3/stm32/f0/rcc.h @@ -499,7 +499,6 @@ void rcc_osc_ready_int_clear(enum rcc_osc osc); void rcc_osc_ready_int_enable(enum rcc_osc osc); void rcc_osc_ready_int_disable(enum rcc_osc osc); int rcc_osc_ready_int_flag(enum rcc_osc osc); -void rcc_wait_for_osc_ready(enum rcc_osc osc); void rcc_osc_on(enum rcc_osc osc); void rcc_osc_off(enum rcc_osc osc); void rcc_osc_bypass_enable(enum rcc_osc osc); diff --git a/include/libopencm3/stm32/f1/rcc.h b/include/libopencm3/stm32/f1/rcc.h index ed90ccca..fa6f0515 100644 --- a/include/libopencm3/stm32/f1/rcc.h +++ b/include/libopencm3/stm32/f1/rcc.h @@ -684,7 +684,6 @@ void rcc_osc_ready_int_disable(enum rcc_osc osc); int rcc_osc_ready_int_flag(enum rcc_osc osc); void rcc_css_int_clear(void); int rcc_css_int_flag(void); -void rcc_wait_for_osc_ready(enum rcc_osc osc); void rcc_osc_on(enum rcc_osc osc); void rcc_osc_off(enum rcc_osc osc); void rcc_css_enable(void); diff --git a/include/libopencm3/stm32/f2/rcc.h b/include/libopencm3/stm32/f2/rcc.h index 7b7751ab..d98f3fea 100644 --- a/include/libopencm3/stm32/f2/rcc.h +++ b/include/libopencm3/stm32/f2/rcc.h @@ -737,7 +737,6 @@ void rcc_osc_ready_int_disable(enum rcc_osc osc); int rcc_osc_ready_int_flag(enum rcc_osc osc); void rcc_css_int_clear(void); int rcc_css_int_flag(void); -void rcc_wait_for_osc_ready(enum rcc_osc osc); void rcc_wait_for_sysclk_status(enum rcc_osc osc); void rcc_osc_on(enum rcc_osc osc); void rcc_osc_off(enum rcc_osc osc); diff --git a/include/libopencm3/stm32/f3/rcc.h b/include/libopencm3/stm32/f3/rcc.h index 2de35b21..c5dc6571 100644 --- a/include/libopencm3/stm32/f3/rcc.h +++ b/include/libopencm3/stm32/f3/rcc.h @@ -588,7 +588,6 @@ void rcc_osc_ready_int_disable(enum rcc_osc osc); int rcc_osc_ready_int_flag(enum rcc_osc osc); void rcc_css_int_clear(void); int rcc_css_int_flag(void); -void rcc_wait_for_osc_ready(enum rcc_osc osc); void rcc_wait_for_osc_not_ready(enum rcc_osc osc); void rcc_wait_for_sysclk_status(enum rcc_osc osc); void rcc_osc_on(enum rcc_osc osc); diff --git a/include/libopencm3/stm32/f4/rcc.h b/include/libopencm3/stm32/f4/rcc.h index e50fbabb..749042de 100644 --- a/include/libopencm3/stm32/f4/rcc.h +++ b/include/libopencm3/stm32/f4/rcc.h @@ -945,7 +945,6 @@ void rcc_osc_ready_int_disable(enum rcc_osc osc); int rcc_osc_ready_int_flag(enum rcc_osc osc); void rcc_css_int_clear(void); int rcc_css_int_flag(void); -void rcc_wait_for_osc_ready(enum rcc_osc osc); void rcc_wait_for_sysclk_status(enum rcc_osc osc); void rcc_osc_on(enum rcc_osc osc); void rcc_osc_off(enum rcc_osc osc); diff --git a/include/libopencm3/stm32/l0/rcc.h b/include/libopencm3/stm32/l0/rcc.h index c6bbefce..a5ee0da5 100644 --- a/include/libopencm3/stm32/l0/rcc.h +++ b/include/libopencm3/stm32/l0/rcc.h @@ -633,7 +633,6 @@ void rcc_osc_ready_int_clear(enum rcc_osc osc); void rcc_osc_ready_int_enable(enum rcc_osc osc); void rcc_osc_ready_int_disable(enum rcc_osc osc); int rcc_osc_ready_int_flag(enum rcc_osc osc); -void rcc_wait_for_osc_ready(enum rcc_osc osc); void rcc_set_hsi48_source_rc48(void); void rcc_set_hsi48_source_pll(void); void rcc_set_sysclk_source(enum rcc_osc osc); diff --git a/include/libopencm3/stm32/l1/rcc.h b/include/libopencm3/stm32/l1/rcc.h index 778f9abe..30c68c73 100644 --- a/include/libopencm3/stm32/l1/rcc.h +++ b/include/libopencm3/stm32/l1/rcc.h @@ -603,7 +603,6 @@ void rcc_osc_ready_int_disable(enum rcc_osc osc); int rcc_osc_ready_int_flag(enum rcc_osc osc); void rcc_css_int_clear(void); int rcc_css_int_flag(void); -void rcc_wait_for_osc_ready(enum rcc_osc osc); void rcc_wait_for_sysclk_status(enum rcc_osc osc); void rcc_osc_on(enum rcc_osc osc); void rcc_osc_off(enum rcc_osc osc); diff --git a/include/libopencm3/stm32/l4/rcc.h b/include/libopencm3/stm32/l4/rcc.h index 3c830ce0..c191fde7 100644 --- a/include/libopencm3/stm32/l4/rcc.h +++ b/include/libopencm3/stm32/l4/rcc.h @@ -931,7 +931,6 @@ int rcc_osc_ready_int_flag(enum rcc_osc osc); void rcc_css_int_clear(void); int rcc_css_int_flag(void); bool rcc_is_osc_ready(enum rcc_osc osc); -void rcc_wait_for_osc_ready(enum rcc_osc osc); void rcc_wait_for_sysclk_status(enum rcc_osc osc); void rcc_osc_on(enum rcc_osc osc); void rcc_osc_off(enum rcc_osc osc);