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

Rename rcc_ppre1_frequency and rcc_ppre2_frequency

Browse Source 
Rename rcc_ppre1_frequency and rcc_ppre2_frequency to rcc_apb1_frequency and rcc_apb2_frequency
Also add rcc_ahb_frequency (although it is not set correctly in all cases) which will be fixed by
the rcc commits later. Also fixup the only use in the library of these variables, the USART code.

And fix the typos that resulted
Make l1 generic too
This commit is contained in:
Chuck McManis
2014-12-13 18:11:37 -08:00
parent 2429159203
commit 9ddfcb0e53
15 changed files with 94 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,8 +40,9 @@
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/flash.h>
uint32_t rcc_core_frequency = 8000000; /* 8MHz after reset */
uint32_t rcc_ppre_frequency = 8000000; /* 8MHz after reset */
/* Set the default clock frequencies */
uint32_t rcc_ahb_frequency = 8000000; /* 8MHz after reset */
uint32_t rcc_apb1_frequency = 8000000; /* 8MHz after reset */
/*---------------------------------------------------------------------------*/
/** @brief RCC Clear the Oscillator Ready Interrupt Flag
@@ -503,8 +504,8 @@ void rcc_clock_setup_in_hsi_out_8mhz(void)
flash_set_ws(FLASH_ACR_LATENCY_000_024MHZ);
rcc_ppre_frequency = 8000000;
rcc_core_frequency = 8000000;
rcc_apb1_frequency = 8000000;
rcc_ahb_frequency = 8000000;
}
void rcc_clock_setup_in_hsi_out_16mhz(void)
@@ -527,8 +528,8 @@ void rcc_clock_setup_in_hsi_out_16mhz(void)
rcc_wait_for_osc_ready(PLL);
rcc_set_sysclk_source(PLL);
rcc_ppre_frequency = 16000000;
rcc_core_frequency = 16000000;
rcc_apb1_frequency = 16000000;
rcc_ahb_frequency = 16000000;
}
@@ -552,8 +553,8 @@ void rcc_clock_setup_in_hsi_out_24mhz(void)
rcc_wait_for_osc_ready(PLL);
rcc_set_sysclk_source(PLL);
rcc_ppre_frequency = 24000000;
rcc_core_frequency = 24000000;
rcc_apb1_frequency = 24000000;
rcc_ahb_frequency = 24000000;
}
void rcc_clock_setup_in_hsi_out_32mhz(void)
@@ -576,8 +577,8 @@ void rcc_clock_setup_in_hsi_out_32mhz(void)
rcc_wait_for_osc_ready(PLL);
rcc_set_sysclk_source(PLL);
rcc_ppre_frequency = 32000000;
rcc_core_frequency = 32000000;
rcc_apb1_frequency = 32000000;
rcc_ahb_frequency = 32000000;
}
void rcc_clock_setup_in_hsi_out_40mhz(void)
@@ -600,8 +601,8 @@ void rcc_clock_setup_in_hsi_out_40mhz(void)
rcc_wait_for_osc_ready(PLL);
rcc_set_sysclk_source(PLL);
rcc_ppre_frequency = 40000000;
rcc_core_frequency = 40000000;
rcc_apb1_frequency = 40000000;
rcc_ahb_frequency = 40000000;
}
void rcc_clock_setup_in_hsi_out_48mhz(void)
@@ -624,8 +625,8 @@ void rcc_clock_setup_in_hsi_out_48mhz(void)
rcc_wait_for_osc_ready(PLL);
rcc_set_sysclk_source(PLL);
rcc_ppre_frequency = 48000000;
rcc_core_frequency = 48000000;
rcc_apb1_frequency = 48000000;
rcc_ahb_frequency = 48000000;
}
/**@}*/

4
lib/stm32/f0/usart.c
View File

@@ -41,10 +41,10 @@
void usart_set_baudrate(uint32_t usart, uint32_t baud)
{
uint32_t clock = rcc_ppre_frequency;
uint32_t clock = rcc_apb1_frequency;
if (usart == USART1) {
clock = rcc_ppre_frequency;
clock = rcc_apb1_frequency;
/* TODO selective PCLK, SYSCLK, HSI or LSE */
}