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

[stm32f1] Fix bad RCC_ definitions for issue #77

Browse Source
This commit is contained in:
Frantisek Burian 2014-01-10 16:36:42 +01:00 committed by Karl Palsson
parent 5248bee639
commit 0d08891c8d
2 changed files with 79 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/libopencm3/stm32/f1/rcc.h
View File

@ -80,6 +80,36 @@
/* --- RCC_CFGR values ----------------------------------------------------- */
#define RCC_CFGR_MCO_SHIFT 24
#define RCC_CFGR_MCO (0xF << RCC_CFGR_MCO_SHIFT)
#define RCC_CFGR_OTGFSPRE (1 << 22) /* Connectivity line */
#define RCC_CFGR_USBPRE (1 << 22) /* LD,MD, HD, XL */
#define RCC_CFGR_PLLMUL_SHIFT 18
#define RCC_CFGR_PLLMUL (0xF << RCC_CFGR_PLLMUL_SHIFT)
#define RCC_CFGR_PLLXTPRE (1 << 17)
#define RCC_CFGR_PLLSRC (1 << 16)
#define RCC_CFGR_ADCPRE_SHIFT 14
#define RCC_CFGR_ADCPRE (3 << RCC_CFGR_ADCPRE_SHIFT)
#define RCC_CFGR_PPRE2_SHIFT 11
#define RCC_CFGR_PPRE2 (7 << RCC_CFGR_PPRE2_SHIFT)
#define RCC_CFGR_PPRE1_SHIFT 8
#define RCC_CFGR_PPRE1 (7 << RCC_CFGR_PPRE1_SHIFT)
#define RCC_CFGR_HPRE_SHIFT 4
#define RCC_CFGR_HPRE (0xF << RCC_CFGR_HPRE_SHIFT)
#define RCC_CFGR_SWS_SHIFT 2
#define RCC_CFGR_SWS (3 << RCC_CFGR_SWS_SHIFT)
#define RCC_CFGR_SW_SHIFT 0
#define RCC_CFGR_SW (3 << RCC_CFGR_SW_SHIFT)
/* MCO: Microcontroller clock output */
/** @defgroup rcc_cfgr_co RCC_CFGR Microcontroller Clock Output Source
@ingroup STM32F1xx_rcc_defines
@ -423,14 +453,24 @@
/* I2S2SRC: I2S2 clock source */
#define RCC_CFGR2_I2S2SRC_SYSCLK 0x0
#define RCC_CFGR2_I2S2SRC_PLL3_VCO_CLK 0x1
#define RCC_CFGR2_I2S2SRC (1 << 17)
/* PREDIV1SRC: PREDIV1 entry clock source */
#define RCC_CFGR2_PREDIV1SRC_HSE_CLK 0x0
#define RCC_CFGR2_PREDIV1SRC_PLL2_CLK 0x1
#define RCC_CFGR2_PREDIV1SRC (1 << 16)
#define RCC_CFGR2_PLL2MUL (1 << 0)
#define RCC_CFGR2_PREDIV2 (1 << 0)
#define RCC_CFGR2_PREDIV1 (1 << 0)
#define RCC_CFGR2_PLL3MUL_SHIFT 12
#define RCC_CFGR2_PLL3MUL (0xF << RCC_CFGR2_PLL3MUL_SHIFT)
#define RCC_CFGR2_PLL2MUL_SHIFT 8
#define RCC_CFGR2_PLL2MUL (0xF << RCC_CFGR2_PLL2MUL_SHIFT)
#define RCC_CFGR2_PREDIV2_SHIFT 4
#define RCC_CFGR2_PREDIV2 (0xF << RCC_CFGR2_PREDIV2_SHIFT)
#define RCC_CFGR2_PREDIV1_SHIFT 0
#define RCC_CFGR2_PREDIV1 (0xF << RCC_CFGR2_PREDIV1_SHIFT)
/* PLL3MUL: PLL3 multiplication factor */
#define RCC_CFGR2_PLL3MUL_PLL3_CLK_MUL8 0x6

104
lib/stm32/f1/rcc.c
View File

@ -427,11 +427,8 @@ void rcc_osc_bypass_disable(enum rcc_osc osc)
void rcc_set_sysclk_source(uint32_t clk)
{
uint32_t reg32;
reg32 = RCC_CFGR;
reg32 &= ~((1 << 1) | (1 << 0));
RCC_CFGR = (reg32 | clk);
RCC_CFGR = (RCC_CFGR & ~RCC_CFGR_SW) |
(clk << RCC_CFGR_SW_SHIFT);
}
/*---------------------------------------------------------------------------*/
@ -444,11 +441,8 @@ void rcc_set_sysclk_source(uint32_t clk)
void rcc_set_pll_multiplication_factor(uint32_t mul)
{
uint32_t reg32;
reg32 = RCC_CFGR;
reg32 &= ~((1 << 21) | (1 << 20) | (1 << 19) | (1 << 18));
RCC_CFGR = (reg32 | (mul << 18));
RCC_CFGR = (RCC_CFGR & ~RCC_CFGR_PLLMUL) |
(mul << RCC_CFGR_PLLMUL_SHIFT);
}
/*---------------------------------------------------------------------------*/
@ -461,11 +455,8 @@ void rcc_set_pll_multiplication_factor(uint32_t mul)
void rcc_set_pll2_multiplication_factor(uint32_t mul)
{
uint32_t reg32;
reg32 = RCC_CFGR2;
reg32 &= ~((1 << 11) | (1 << 10) | (1 << 9) | (1 << 8));
RCC_CFGR2 = (reg32 | (mul << 8));
RCC_CFGR2 = (RCC_CFGR2 & ~RCC_CFGR2_PLL2MUL) |
(mul << RCC_CFGR2_PLL2MUL_SHIFT);
}
/*---------------------------------------------------------------------------*/
@ -478,11 +469,8 @@ void rcc_set_pll2_multiplication_factor(uint32_t mul)
void rcc_set_pll3_multiplication_factor(uint32_t mul)
{
uint32_t reg32;
reg32 = RCC_CFGR2;
reg32 &= ~((1 << 15) | (1 << 14) | (1 << 13) | (1 << 12));
RCC_CFGR2 = (reg32 | (mul << 12));
RCC_CFGR2 = (RCC_CFGR2 & ~RCC_CFGR2_PLL3MUL) |
(mul << RCC_CFGR2_PLL3MUL_SHIFT);
}
/*---------------------------------------------------------------------------*/
@ -495,11 +483,8 @@ void rcc_set_pll3_multiplication_factor(uint32_t mul)
void rcc_set_pll_source(uint32_t pllsrc)
{
uint32_t reg32;
reg32 = RCC_CFGR;
reg32 &= ~(1 << 16);
RCC_CFGR = (reg32 | (pllsrc << 16));
RCC_CFGR = (RCC_CFGR & ~RCC_CFGR_PLLSRC) |
(pllsrc << 16);
}
/*---------------------------------------------------------------------------*/
@ -512,11 +497,8 @@ void rcc_set_pll_source(uint32_t pllsrc)
void rcc_set_pllxtpre(uint32_t pllxtpre)
{
uint32_t reg32;
reg32 = RCC_CFGR;
reg32 &= ~(1 << 17);
RCC_CFGR = (reg32 | (pllxtpre << 17));
RCC_CFGR = (RCC_CFGR & ~RCC_CFGR_PLLXTPRE) |
(pllxtpre << 17);
}
/*---------------------------------------------------------------------------*/
@ -529,11 +511,8 @@ The ADC's have a common clock prescale setting.
void rcc_set_adcpre(uint32_t adcpre)
{
uint32_t reg32;
reg32 = RCC_CFGR;
reg32 &= ~((1 << 14) | (1 << 15));
RCC_CFGR = (reg32 | (adcpre << 14));
RCC_CFGR = (RCC_CFGR & ~RCC_CFGR_ADCPRE) |
(adcpre << RCC_CFGR_ADCPRE_SHIFT);
}
/*---------------------------------------------------------------------------*/
@ -544,11 +523,8 @@ void rcc_set_adcpre(uint32_t adcpre)
void rcc_set_ppre2(uint32_t ppre2)
{
uint32_t reg32;
reg32 = RCC_CFGR;
reg32 &= ~((1 << 11) | (1 << 12) | (1 << 13));
RCC_CFGR = (reg32 | (ppre2 << 11));
RCC_CFGR = (RCC_CFGR & ~RCC_CFGR_PPRE2) |
(ppre2 << RCC_CFGR_PPRE2_SHIFT);
}
/*---------------------------------------------------------------------------*/
@ -561,11 +537,9 @@ void rcc_set_ppre2(uint32_t ppre2)
void rcc_set_ppre1(uint32_t ppre1)
{
uint32_t reg32;
RCC_CFGR = (RCC_CFGR & ~RCC_CFGR_PPRE1) |
(ppre1 << RCC_CFGR_PPRE1_SHIFT);
reg32 = RCC_CFGR;
reg32 &= ~((1 << 8) | (1 << 9) | (1 << 10));
RCC_CFGR = (reg32 | (ppre1 << 8));
}
/*---------------------------------------------------------------------------*/
@ -576,11 +550,9 @@ void rcc_set_ppre1(uint32_t ppre1)
void rcc_set_hpre(uint32_t hpre)
{
uint32_t reg32;
RCC_CFGR = (RCC_CFGR & ~RCC_CFGR_HPRE) |
(hpre << RCC_CFGR_HPRE_SHIFT);
reg32 = RCC_CFGR;
reg32 &= ~((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7));
RCC_CFGR = (reg32 | (hpre << 4));
}
/*---------------------------------------------------------------------------*/
@ -596,41 +568,37 @@ The prescale factor can be set to 1 (no prescale) for use when the PLL clock is
void rcc_set_usbpre(uint32_t usbpre)
{
uint32_t reg32;
reg32 = RCC_CFGR;
reg32 &= ~(1 << 22);
RCC_CFGR = (reg32 | (usbpre << 22));
if (usbpre)
RCC_CFGR |= RCC_CFGR_USBPRE;
else
RCC_CFGR &= ~RCC_CFGR_USBPRE;
}
void rcc_set_prediv1(uint32_t prediv)
{
uint32_t reg32;
reg32 = RCC_CFGR2;
reg32 &= ~(1 << 3) | (1 << 2) | (1 << 1) | (1 << 0);
RCC_CFGR2 |= (reg32 | prediv);
RCC_CFGR2 = (RCC_CFGR2 & ~RCC_CFGR2_PREDIV1) |
(prediv << RCC_CFGR2_PREDIV1_SHIFT);
}
void rcc_set_prediv2(uint32_t prediv)
{
uint32_t reg32;
reg32 = RCC_CFGR2;
reg32 &= ~(1 << 7) | (1 << 6) | (1 << 5) | (1 << 4);
RCC_CFGR2 |= (reg32 | (prediv << 4));
RCC_CFGR2 = (RCC_CFGR2 & ~RCC_CFGR2_PREDIV2) |
(prediv << RCC_CFGR2_PREDIV2_SHIFT);
}
void rcc_set_prediv1_source(uint32_t rccsrc)
{
RCC_CFGR2 &= ~(1 << 16);
RCC_CFGR2 |= (rccsrc << 16);
if (rccsrc)
RCC_CFGR2 |= RCC_CFGR2_PREDIV1SRC;
else
RCC_CFGR2 &= ~RCC_CFGR2_PREDIV1SRC;
}
void rcc_set_mco(uint32_t mcosrc)
{
uint32_t reg32;
reg32 = RCC_CFGR;
reg32 &= ~((1 << 27) | (1 << 26) | (1 << 25) | (1 << 24));
RCC_CFGR |= (reg32 | (mcosrc << 24));
RCC_CFGR = (RCC_CFGR & ~RCC_CFGR_MCO) |
(mcosrc << RCC_CFGR_MCO_SHIFT);
}
/*---------------------------------------------------------------------------*/
@ -645,7 +613,7 @@ void rcc_set_mco(uint32_t mcosrc)
uint32_t rcc_system_clock_source(void)
{
/* Return the clock source which is used as system clock. */
return (RCC_CFGR & 0x000c) >> 2;
return (RCC_CFGR & RCC_CFGR_SWS) >> RCC_CFGR_SWS_SHIFT;
}
/*---------------------------------------------------------------------------*/