jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

[BREAKING] stm32f2: rcc: use correct namespace prefixes for osc

Browse Source 
Most other families were fully converted earlier, f2 missed a few.

Fixes: 3a7cbec7
This commit is contained in:
Karl Palsson 2016-08-16 17:11:43 +00:00 committed by Karl Palsson
parent 90debb9fd7
commit 29277adbe3
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/libopencm3/stm32/f2/rcc.h
View File

@ -499,9 +499,13 @@ struct rcc_clock_scale {
extern const struct rcc_clock_scale rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_END]; extern const struct rcc_clock_scale rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_END];
typedef enum { enum rcc_osc {
RCC_PLL, RCC_HSE, RCC_HSI, RCC_LSE, RCC_LSI RCC_PLL,
} osc_t; RCC_HSE,
RCC_HSI,
RCC_LSE,
RCC_LSI
};
#define _REG_BIT(base, bit) (((base) << 5) + (bit)) #define _REG_BIT(base, bit) (((base) << 5) + (bit))
@ -727,20 +731,20 @@ enum rcc_periph_rst {
BEGIN_DECLS BEGIN_DECLS
void rcc_osc_ready_int_clear(osc_t osc); void rcc_osc_ready_int_clear(enum rcc_osc osc);
void rcc_osc_ready_int_enable(osc_t osc); void rcc_osc_ready_int_enable(enum rcc_osc osc);
void rcc_osc_ready_int_disable(osc_t osc); void rcc_osc_ready_int_disable(enum rcc_osc osc);
int rcc_osc_ready_int_flag(osc_t osc); int rcc_osc_ready_int_flag(enum rcc_osc osc);
void rcc_css_int_clear(void); void rcc_css_int_clear(void);
int rcc_css_int_flag(void); int rcc_css_int_flag(void);
void rcc_wait_for_osc_ready(osc_t osc); void rcc_wait_for_osc_ready(enum rcc_osc osc);
void rcc_wait_for_sysclk_status(osc_t osc); void rcc_wait_for_sysclk_status(enum rcc_osc osc);
void rcc_osc_on(osc_t osc); void rcc_osc_on(enum rcc_osc osc);
void rcc_osc_off(osc_t osc); void rcc_osc_off(enum rcc_osc osc);
void rcc_css_enable(void); void rcc_css_enable(void);
void rcc_css_disable(void); void rcc_css_disable(void);
void rcc_osc_bypass_enable(osc_t osc); void rcc_osc_bypass_enable(enum rcc_osc osc);
void rcc_osc_bypass_disable(osc_t osc); void rcc_osc_bypass_disable(enum rcc_osc osc);
void rcc_set_sysclk_source(uint32_t clk); void rcc_set_sysclk_source(uint32_t clk);
void rcc_set_pll_source(uint32_t pllsrc); void rcc_set_pll_source(uint32_t pllsrc);
void rcc_set_ppre2(uint32_t ppre2); void rcc_set_ppre2(uint32_t ppre2);

20
lib/stm32/f2/rcc.c
View File

@ -64,7 +64,7 @@ const struct rcc_clock_scale rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_END] = {
}, },
}; };
void rcc_osc_ready_int_clear(osc_t osc) void rcc_osc_ready_int_clear(enum rcc_osc osc)
{ {
switch (osc) { switch (osc) {
case RCC_PLL: case RCC_PLL:
@ -85,7 +85,7 @@ void rcc_osc_ready_int_clear(osc_t osc)
} }
} }
void rcc_osc_ready_int_enable(osc_t osc) void rcc_osc_ready_int_enable(enum rcc_osc osc)
{ {
switch (osc) { switch (osc) {
case RCC_PLL: case RCC_PLL:
@ -106,7 +106,7 @@ void rcc_osc_ready_int_enable(osc_t osc)
} }
} }
void rcc_osc_ready_int_disable(osc_t osc) void rcc_osc_ready_int_disable(enum rcc_osc osc)
{ {
switch (osc) { switch (osc) {
case RCC_PLL: case RCC_PLL:
@ -127,7 +127,7 @@ void rcc_osc_ready_int_disable(osc_t osc)
} }
} }
int rcc_osc_ready_int_flag(osc_t osc) int rcc_osc_ready_int_flag(enum rcc_osc osc)
{ {
switch (osc) { switch (osc) {
case RCC_PLL: case RCC_PLL:
@ -160,7 +160,7 @@ int rcc_css_int_flag(void)
return ((RCC_CIR & RCC_CIR_CSSF) != 0); return ((RCC_CIR & RCC_CIR_CSSF) != 0);
} }
void rcc_wait_for_osc_ready(osc_t osc) void rcc_wait_for_osc_ready(enum rcc_osc osc)
{ {
switch (osc) { switch (osc) {
case RCC_PLL: case RCC_PLL:
@ -181,7 +181,7 @@ void rcc_wait_for_osc_ready(osc_t osc)
} }
} }
void rcc_wait_for_sysclk_status(osc_t osc) void rcc_wait_for_sysclk_status(enum rcc_osc osc)
{ {
switch (osc) { switch (osc) {
case RCC_PLL: case RCC_PLL:
@ -202,7 +202,7 @@ void rcc_wait_for_sysclk_status(osc_t osc)
} }
} }
void rcc_osc_on(osc_t osc) void rcc_osc_on(enum rcc_osc osc)
{ {
switch (osc) { switch (osc) {
case RCC_PLL: case RCC_PLL:
@ -223,7 +223,7 @@ void rcc_osc_on(osc_t osc)
} }
} }
void rcc_osc_off(osc_t osc) void rcc_osc_off(enum rcc_osc osc)
{ {
switch (osc) { switch (osc) {
case RCC_PLL: case RCC_PLL:
@ -254,7 +254,7 @@ void rcc_css_disable(void)
RCC_CR &= ~RCC_CR_CSSON; RCC_CR &= ~RCC_CR_CSSON;
} }
void rcc_osc_bypass_enable(osc_t osc) void rcc_osc_bypass_enable(enum rcc_osc osc)
{ {
switch (osc) { switch (osc) {
case RCC_HSE: case RCC_HSE:
@ -271,7 +271,7 @@ void rcc_osc_bypass_enable(osc_t osc)
} }
} }
void rcc_osc_bypass_disable(osc_t osc) void rcc_osc_bypass_disable(enum rcc_osc osc)
{ {
switch (osc) { switch (osc) {
case RCC_HSE: case RCC_HSE: