aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32-h103
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2010-03-04 20:37:04 +0100
committerPiotr Esden-Tempski2010-03-04 20:37:04 +0100
commitd7489ebfbd0798c804ed3d7073040cedaea38d26 (patch)
tree11be596cedb87afb9881b6b21e4e20c1364edeb1 /examples/stm32-h103
parentd84c4030b2c90cb2c2fe0a50cfeb1e34cdf48560 (diff)
Added standard clock setup routines.
Thanks to Thomas Otto for pointing out problems with the clock code in examples and his clock routine implementations. Based on that the most common clock combination routines were added to the library and all routines in examples setting up the clock replaced with calls to that functions.
Diffstat (limited to 'examples/stm32-h103')
-rw-r--r--examples/stm32-h103/fancyblink/fancyblink.c21
-rw-r--r--examples/stm32-h103/spi/spi.c18
-rw-r--r--examples/stm32-h103/usart/usart.c28
3 files changed, 10 insertions, 57 deletions
diff --git a/examples/stm32-h103/fancyblink/fancyblink.c b/examples/stm32-h103/fancyblink/fancyblink.c
index 1118e4d..39652ec 100644
--- a/examples/stm32-h103/fancyblink/fancyblink.c
+++ b/examples/stm32-h103/fancyblink/fancyblink.c
@@ -23,30 +23,15 @@
/* Set STM32 to 72 MHz. */
void clock_setup(void)
{
- /* Select HSI as SYSCLK source. */
- rcc_set_sysclk_source(SW_SYSCLKSEL_HSICLK);
+ rcc_clock_setup_in_hse_8mhz_out_72mhz();
- /* Set the PLL multiplication factor to 9. */
- rcc_set_pll_multiplication_factor(PLLMUL_PLL_CLK_MUL9);
-
- /* Select HSI/2 as PLL source. */
- rcc_set_pll_source(PLLSRC_HSI_CLK_DIV2);
-
- rcc_set_pllxtpre(PLLXTPRE_HSE_CLK_DIV2);
-
- /* Enable PLL oscillator and wait for it to stabilize. */
- rcc_osc_on(PLL);
- rcc_wait_for_osc_ready(PLL);
+ /* Enable GPIOC clock. */
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, IOPCEN);
- /* Select PLL as SYSCLK source. */
- rcc_set_sysclk_source(SW_SYSCLKSEL_PLLCLK);
}
void gpio_setup(void)
{
- /* Enable GPIOC clock. */
- rcc_peripheral_enable_clock(&RCC_APB2ENR, IOPCEN);
-
/* Set GPIO12 (in GPIO port C) to 'output push-pull'. */
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO12);
diff --git a/examples/stm32-h103/spi/spi.c b/examples/stm32-h103/spi/spi.c
index bf313be..57ac47e 100644
--- a/examples/stm32-h103/spi/spi.c
+++ b/examples/stm32-h103/spi/spi.c
@@ -21,23 +21,7 @@
void clock_setup(void)
{
- /* Select HSI as SYSCLK source. */
- rcc_set_sysclk_source(SW_SYSCLKSEL_HSICLK);
-
- /* Set the PLL multiplication factor to 9. */
- rcc_set_pll_multiplication_factor(PLLMUL_PLL_CLK_MUL9);
-
- /* Select HSI/2 as PLL source. */
- rcc_set_pll_source(PLLSRC_HSI_CLK_DIV2);
-
- rcc_set_pllxtpre(PLLXTPRE_HSE_CLK_DIV2);
-
- /* Enable PLL oscillator and wait for it to stabilize. */
- rcc_osc_on(PLL);
- rcc_wait_for_osc_ready(PLL);
-
- /* Select PLL as SYSCLK source. */
- rcc_set_sysclk_source(SW_SYSCLKSEL_PLLCLK);
+ rcc_clock_setup_in_hse_8mhz_out_72mhz();
}
void spi_setup(void)
diff --git a/examples/stm32-h103/usart/usart.c b/examples/stm32-h103/usart/usart.c
index 7f1c343..3776f84 100644
--- a/examples/stm32-h103/usart/usart.c
+++ b/examples/stm32-h103/usart/usart.c
@@ -23,31 +23,18 @@
void clock_setup(void)
{
- /* Select HSI as SYSCLK source. */
- rcc_set_sysclk_source(SW_SYSCLKSEL_HSICLK);
+ rcc_clock_setup_in_hse_8mhz_out_72mhz();
- /* Set the PLL multiplication factor to 9. */
- rcc_set_pll_multiplication_factor(PLLMUL_PLL_CLK_MUL9);
-
- /* Select HSI/2 as PLL source. */
- rcc_set_pll_source(PLLSRC_HSI_CLK_DIV2);
-
- rcc_set_pllxtpre(PLLXTPRE_HSE_CLK_DIV2);
-
- /* Enable PLL oscillator and wait for it to stabilize. */
- rcc_osc_on(PLL);
- rcc_wait_for_osc_ready(PLL);
-
- /* Select PLL as SYSCLK source. */
- rcc_set_sysclk_source(SW_SYSCLKSEL_PLLCLK);
-}
+ /* Enable GPIOC clock. */
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, IOPCEN);
-void usart_setup(void)
-{
/* Enable clocks for GPIO port B (for GPIO_USART3_TX) and USART3. */
rcc_peripheral_enable_clock(&RCC_APB2ENR, IOPBEN);
rcc_peripheral_enable_clock(&RCC_APB1ENR, USART3EN);
+}
+void usart_setup(void)
+{
/* Setup GPIO pin GPIO_USART3_TX/GPIO10 on GPIO port B for transmit. */
gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ,
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART3_TX);
@@ -66,9 +53,6 @@ void usart_setup(void)
void gpio_setup(void)
{
- /* Enable GPIOC clock. */
- rcc_peripheral_enable_clock(&RCC_APB2ENR, IOPCEN);
-
/* Set GPIO12 (in GPIO port C) to 'output push-pull'. */
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO12);