From e599e34073525c75291ce23f4f577c03992d15d1 Mon Sep 17 00:00:00 2001
From: Piotr Esden-Tempski <piotr@esden.net>
Date: Sat, 19 Jun 2021 00:56:57 -0700
Subject: [PATCH] Updated all rcc_clock_setups to use the new lookup tables.

The old "one function per config" system is depricated for quite a while
now...
---
 examples/stm32/f1/lisa-m-1/can/can.c                            | 2 +-
 examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c              | 2 +-
 examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c                  | 2 +-
 examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c                     | 2 +-
 examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c                     | 2 +-
 examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c                | 2 +-
 .../stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c     | 2 +-
 .../f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c   | 2 +-
 .../adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c       | 2 +-
 examples/stm32/f1/lisa-m-2/adc_regular/adc.c                    | 2 +-
 examples/stm32/f1/lisa-m-2/can/can.c                            | 2 +-
 examples/stm32/f1/lisa-m-2/fancyblink/fancyblink.c              | 2 +-
 examples/stm32/f1/lisa-m-2/spi/spi.c                            | 2 +-
 examples/stm32/f1/lisa-m-2/spi_dma/spi_dma.c                    | 2 +-
 examples/stm32/f1/lisa-m-2/spi_dma_adv/spi_dma_adv.c            | 2 +-
 examples/stm32/f1/lisa-m-2/usart/usart.c                        | 2 +-
 examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c                | 2 +-
 examples/stm32/f1/lisa-m-2/usart_irq/usart_irq.c                | 2 +-
 examples/stm32/f1/lisa-m-2/usart_irq_printf/usart_irq_printf.c  | 2 +-
 examples/stm32/f1/lisa-m-2/usart_printf/usart_printf.c          | 2 +-
 examples/stm32/f1/mb525/fancyblink/fancyblink.c                 | 2 +-
 examples/stm32/f1/mb525/pwmleds/pwmleds.c                       | 2 +-
 examples/stm32/f1/obldc-strip/can/can.c                         | 2 +-
 examples/stm32/f1/obldc-strip/led/led.c                         | 2 +-
 examples/stm32/f1/obldc-strip/systick/systick.c                 | 2 +-
 examples/stm32/f1/obldc-strip/usart/usart.c                     | 2 +-
 examples/stm32/f1/obldc/can/can.c                               | 2 +-
 examples/stm32/f1/obldc/led/led.c                               | 2 +-
 examples/stm32/f1/obldc/pwmleds/pwmleds.c                       | 2 +-
 examples/stm32/f1/obldc/systick/systick.c                       | 2 +-
 examples/stm32/f1/obldc/usart/usart.c                           | 2 +-
 examples/stm32/f1/obldc/usart_irq/usart_irq.c                   | 2 +-
 examples/stm32/f1/other/adc_temperature_sensor/adc.c            | 2 +-
 examples/stm32/f1/other/dma_mem2mem/dma.c                       | 2 +-
 examples/stm32/f1/other/dogm128/main.c                          | 2 +-
 examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c   | 2 +-
 examples/stm32/f1/other/systick/systick.c                       | 2 +-
 examples/stm32/f1/other/timer_interrupt/timer.c                 | 2 +-
 examples/stm32/f1/other/usb_cdcacm/cdcacm.c                     | 2 +-
 examples/stm32/f1/other/usb_dfu/usbdfu.c                        | 2 +-
 examples/stm32/f1/other/usb_hid/usbhid.c                        | 2 +-
 examples/stm32/f1/stm32-h103/button/button.c                    | 2 +-
 examples/stm32/f1/stm32-h103/exti_both/exti_both.c              | 2 +-
 .../f1/stm32-h103/exti_rising_falling/exti_rising_falling.c     | 2 +-
 examples/stm32/f1/stm32-h103/fancyblink/fancyblink.c            | 2 +-
 examples/stm32/f1/stm32-h103/led_stripe/led_stripe.c            | 2 +-
 examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c              | 2 +-
 examples/stm32/f1/stm32-h103/rtc/rtc.c                          | 2 +-
 examples/stm32/f1/stm32-h103/timer/timer.c                      | 2 +-
 examples/stm32/f1/stm32-h103/traceswo/traceswo.c                | 2 +-
 examples/stm32/f1/stm32-h103/usart/usart.c                      | 2 +-
 examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c              | 2 +-
 .../stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c     | 2 +-
 examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c        | 2 +-
 examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c                | 2 +-
 examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c                   | 2 +-
 examples/stm32/f1/stm32-h103/usb_iap/usbiap.c                   | 2 +-
 examples/stm32/f1/stm32-h107/fancyblink/fancyblink.c            | 2 +-
 .../stm32/f1/stm32-h107/flash_rw_example/flash_rw_example.c     | 2 +-
 examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c            | 2 +-
 examples/stm32/f1/stm32-maple/usart/usart.c                     | 2 +-
 examples/stm32/f1/stm32-maple/usart_irq/usart_irq.c             | 2 +-
 examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c               | 2 +-
 .../stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c  | 2 +-
 examples/stm32/f1/stm32vl-discovery/button/button.c             | 2 +-
 examples/stm32/f1/stm32vl-discovery/fancyblink/fancyblink.c     | 2 +-
 examples/stm32/f1/stm32vl-discovery/rtc/rtc.c                   | 2 +-
 examples/stm32/f1/stm32vl-discovery/spi/spi.c                   | 2 +-
 examples/stm32/f1/stm32vl-discovery/usart/usart.c               | 2 +-
 examples/stm32/f1/waveshare-open103r/button/button.c            | 2 +-
 examples/stm32/f1/waveshare-open103r/fancyblink/fancyblink.c    | 2 +-
 examples/stm32/f1/waveshare-open103r/joystick/joystick.c        | 2 +-
 examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c      | 2 +-
 73 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/examples/stm32/f1/lisa-m-1/can/can.c b/examples/stm32/f1/lisa-m-1/can/can.c
index 96643a4..a4b9a2d 100644
--- a/examples/stm32/f1/lisa-m-1/can/can.c
+++ b/examples/stm32/f1/lisa-m-1/can/can.c
@@ -227,7 +227,7 @@ void usb_lp_can_rx0_isr(void)
 
 int main(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 	gpio_setup();
 	can_setup();
 	systick_setup();
diff --git a/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c b/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c
index e2427e8..dad0c4a 100644
--- a/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c
@@ -24,7 +24,7 @@
 /* Set STM32 to 72 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 
 	/* Enable GPIOB, GPIOC, and AFIO clocks. */
 	rcc_periph_clock_enable(RCC_GPIOB);
diff --git a/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c b/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
index 496d367..8fd75f3 100644
--- a/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
@@ -239,7 +239,7 @@ int main(void)
 
 	usbd_device *usbd_dev;
 
-	rcc_clock_setup_in_hsi_out_48mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOC);
 	rcc_periph_clock_enable(RCC_OTGFS);
diff --git a/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c b/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
index 1b089c1..1ed3ec1 100644
--- a/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
+++ b/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
@@ -258,7 +258,7 @@ int main(void)
 		}
 	}
 
-	rcc_clock_setup_in_hsi_out_48mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOC);
 	rcc_periph_clock_enable(RCC_OTGFS);
diff --git a/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c b/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
index df34be0..e8638f4 100644
--- a/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
+++ b/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
@@ -323,7 +323,7 @@ int main(void)
 {
 	int i;
 
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOA);
 	rcc_periph_clock_enable(RCC_GPIOB);
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c b/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c
index 7b550bd..1829bfb 100644
--- a/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c
+++ b/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c
@@ -120,7 +120,7 @@ int main(void)
 	uint8_t channel_array[16];
 	uint16_t temperature = 0;
 
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 	gpio_setup();
 	usart_setup();
 	adc_setup();
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c
index bbeed14..61667d4 100644
--- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c
@@ -140,7 +140,7 @@ int main(void)
 	uint8_t channel_array[16];
 	uint16_t temperature = 0;
 
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 	gpio_setup();
 	usart_setup();
 	timer_setup();
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c
index dae4f81..303445d 100644
--- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c
@@ -152,7 +152,7 @@ int main(void)
 {
 	uint8_t channel_array[16];
 
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 	gpio_setup();
 	usart_setup();
 	timer_setup();
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c
index 7e8fdc5..39a8121 100644
--- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c
@@ -168,7 +168,7 @@ static void my_usart_print_int(uint32_t usart, int value)
 int main(void)
 {
 
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 	gpio_setup();
 	usart_setup();
 	timer_setup();
diff --git a/examples/stm32/f1/lisa-m-2/adc_regular/adc.c b/examples/stm32/f1/lisa-m-2/adc_regular/adc.c
index 309cebb..ffd2da6 100644
--- a/examples/stm32/f1/lisa-m-2/adc_regular/adc.c
+++ b/examples/stm32/f1/lisa-m-2/adc_regular/adc.c
@@ -116,7 +116,7 @@ int main(void)
 	uint8_t channel_array[16];
 	uint16_t temperature = 0;
 
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 	gpio_setup();
 	usart_setup();
 	adc_setup();
diff --git a/examples/stm32/f1/lisa-m-2/can/can.c b/examples/stm32/f1/lisa-m-2/can/can.c
index 2614ecb..bddaa9b 100644
--- a/examples/stm32/f1/lisa-m-2/can/can.c
+++ b/examples/stm32/f1/lisa-m-2/can/can.c
@@ -227,7 +227,7 @@ void usb_lp_can_rx0_isr(void)
 
 int main(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 	gpio_setup();
 	can_setup();
 	systick_setup();
diff --git a/examples/stm32/f1/lisa-m-2/fancyblink/fancyblink.c b/examples/stm32/f1/lisa-m-2/fancyblink/fancyblink.c
index 6be5d3d..0e9a8f0 100644
--- a/examples/stm32/f1/lisa-m-2/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/lisa-m-2/fancyblink/fancyblink.c
@@ -24,7 +24,7 @@
 /* Set STM32 to 72 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 
 	/* Enable GPIOA, GPIOB, GPIOC, and AFIO clocks. */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/lisa-m-2/spi/spi.c b/examples/stm32/f1/lisa-m-2/spi/spi.c
index 4193669..b290bf0 100644
--- a/examples/stm32/f1/lisa-m-2/spi/spi.c
+++ b/examples/stm32/f1/lisa-m-2/spi/spi.c
@@ -31,7 +31,7 @@ int _write(int file, char *ptr, int len);
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 
 	/* Enable GPIOA, GPIOB, GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/lisa-m-2/spi_dma/spi_dma.c b/examples/stm32/f1/lisa-m-2/spi_dma/spi_dma.c
index f363716..d47d9ab 100644
--- a/examples/stm32/f1/lisa-m-2/spi_dma/spi_dma.c
+++ b/examples/stm32/f1/lisa-m-2/spi_dma/spi_dma.c
@@ -51,7 +51,7 @@ int _write(int file, char *ptr, int len);
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 
 	/* Enable GPIOA, GPIOB, GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/lisa-m-2/spi_dma_adv/spi_dma_adv.c b/examples/stm32/f1/lisa-m-2/spi_dma_adv/spi_dma_adv.c
index e02cc54..d414bde 100644
--- a/examples/stm32/f1/lisa-m-2/spi_dma_adv/spi_dma_adv.c
+++ b/examples/stm32/f1/lisa-m-2/spi_dma_adv/spi_dma_adv.c
@@ -61,7 +61,7 @@ int _write(int file, char *ptr, int len);
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 
 	/* Enable GPIOA, GPIOB, GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/lisa-m-2/usart/usart.c b/examples/stm32/f1/lisa-m-2/usart/usart.c
index 02625a8..ea7a371 100644
--- a/examples/stm32/f1/lisa-m-2/usart/usart.c
+++ b/examples/stm32/f1/lisa-m-2/usart/usart.c
@@ -23,7 +23,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 
 	/* Enable GPIOA, GPIOB, GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c b/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c
index ecc0244..c333499 100644
--- a/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c
+++ b/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c
@@ -25,7 +25,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 
 	/* Enable GPIOA, GPIOB, GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/lisa-m-2/usart_irq/usart_irq.c b/examples/stm32/f1/lisa-m-2/usart_irq/usart_irq.c
index 7b17039..aa8e11a 100644
--- a/examples/stm32/f1/lisa-m-2/usart_irq/usart_irq.c
+++ b/examples/stm32/f1/lisa-m-2/usart_irq/usart_irq.c
@@ -24,7 +24,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 
 	/* Enable GPIOA clock (for LED GPIOs). */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/lisa-m-2/usart_irq_printf/usart_irq_printf.c b/examples/stm32/f1/lisa-m-2/usart_irq_printf/usart_irq_printf.c
index e048d53..87e2b47 100644
--- a/examples/stm32/f1/lisa-m-2/usart_irq_printf/usart_irq_printf.c
+++ b/examples/stm32/f1/lisa-m-2/usart_irq_printf/usart_irq_printf.c
@@ -117,7 +117,7 @@ uint8_t output_ring_buffer[BUFFER_SIZE];
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 
 	/* Enable GPIOA clock (for LED GPIOs). */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/lisa-m-2/usart_printf/usart_printf.c b/examples/stm32/f1/lisa-m-2/usart_printf/usart_printf.c
index da6fc9b..07d3ef6 100644
--- a/examples/stm32/f1/lisa-m-2/usart_printf/usart_printf.c
+++ b/examples/stm32/f1/lisa-m-2/usart_printf/usart_printf.c
@@ -29,7 +29,7 @@ int _write(int file, char *ptr, int len);
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_12mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
 
 	/* Enable GPIOA clock (for LED GPIOs). */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/mb525/fancyblink/fancyblink.c b/examples/stm32/f1/mb525/fancyblink/fancyblink.c
index d40c327..d295b54 100644
--- a/examples/stm32/f1/mb525/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/mb525/fancyblink/fancyblink.c
@@ -23,7 +23,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/mb525/pwmleds/pwmleds.c b/examples/stm32/f1/mb525/pwmleds/pwmleds.c
index 7621393..e06db1d 100644
--- a/examples/stm32/f1/mb525/pwmleds/pwmleds.c
+++ b/examples/stm32/f1/mb525/pwmleds/pwmleds.c
@@ -238,7 +238,7 @@ static const uint16_t gamma_table_3_0[] = {
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable TIM1 clock. */
 	rcc_periph_clock_enable(RCC_TIM1);
diff --git a/examples/stm32/f1/obldc-strip/can/can.c b/examples/stm32/f1/obldc-strip/can/can.c
index 19e3e4c..c5983a0 100644
--- a/examples/stm32/f1/obldc-strip/can/can.c
+++ b/examples/stm32/f1/obldc-strip/can/can.c
@@ -195,7 +195,7 @@ void usb_lp_can_rx0_isr(void)
 
 int main(void)
 {
-	rcc_clock_setup_in_hsi_out_64mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_64MHZ]);
 	gpio_setup();
 	can_setup();
 	systick_setup();
diff --git a/examples/stm32/f1/obldc-strip/led/led.c b/examples/stm32/f1/obldc-strip/led/led.c
index c4a89e1..423cfd8 100644
--- a/examples/stm32/f1/obldc-strip/led/led.c
+++ b/examples/stm32/f1/obldc-strip/led/led.c
@@ -23,7 +23,7 @@
 static void clock_setup(void)
 {
 	/* Set STM32 to 64 MHz. */
-	rcc_clock_setup_in_hsi_out_64mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_64MHZ]);
 
 	/* Enable alternate function peripheral clock. */
 	rcc_periph_clock_enable(RCC_AFIO);
diff --git a/examples/stm32/f1/obldc-strip/systick/systick.c b/examples/stm32/f1/obldc-strip/systick/systick.c
index 17bed8c..af5667b 100644
--- a/examples/stm32/f1/obldc-strip/systick/systick.c
+++ b/examples/stm32/f1/obldc-strip/systick/systick.c
@@ -59,7 +59,7 @@ void sys_tick_handler(void)
 
 int main(void)
 {
-	rcc_clock_setup_in_hsi_out_64mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_64MHZ]);
 	gpio_setup();
 
 	temp32 = 0;
diff --git a/examples/stm32/f1/obldc-strip/usart/usart.c b/examples/stm32/f1/obldc-strip/usart/usart.c
index 24f840f..13a3d6b 100644
--- a/examples/stm32/f1/obldc-strip/usart/usart.c
+++ b/examples/stm32/f1/obldc-strip/usart/usart.c
@@ -23,7 +23,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hsi_out_64mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_64MHZ]);
 
 	/* Enable clocks for GPIO port B (for GPIO_USART1_TX and LED) and USART1. */
 	rcc_periph_clock_enable(RCC_GPIOB);
diff --git a/examples/stm32/f1/obldc/can/can.c b/examples/stm32/f1/obldc/can/can.c
index 83c573e..4ba66f7 100644
--- a/examples/stm32/f1/obldc/can/can.c
+++ b/examples/stm32/f1/obldc/can/can.c
@@ -209,7 +209,7 @@ void usb_lp_can_rx0_isr(void)
 
 int main(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 	gpio_setup();
 	can_setup();
 	systick_setup();
diff --git a/examples/stm32/f1/obldc/led/led.c b/examples/stm32/f1/obldc/led/led.c
index 300fc06..3d1e16c 100644
--- a/examples/stm32/f1/obldc/led/led.c
+++ b/examples/stm32/f1/obldc/led/led.c
@@ -24,7 +24,7 @@
 static void clock_setup(void)
 {
 	/* Set STM32 to 72 MHz. */
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOA clock. */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/obldc/pwmleds/pwmleds.c b/examples/stm32/f1/obldc/pwmleds/pwmleds.c
index a421ec2..3260f79 100644
--- a/examples/stm32/f1/obldc/pwmleds/pwmleds.c
+++ b/examples/stm32/f1/obldc/pwmleds/pwmleds.c
@@ -238,7 +238,7 @@ static const uint16_t gamma_table_3_0[] = {
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable TIM3 clock. */
 	rcc_periph_clock_enable(RCC_TIM3);
diff --git a/examples/stm32/f1/obldc/systick/systick.c b/examples/stm32/f1/obldc/systick/systick.c
index 9af1e8e..b49d662 100644
--- a/examples/stm32/f1/obldc/systick/systick.c
+++ b/examples/stm32/f1/obldc/systick/systick.c
@@ -65,7 +65,7 @@ void sys_tick_handler(void)
 
 int main(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 	gpio_setup();
 
 	gpio_clear(GPIOA, GPIO7);	/* LED1 on */
diff --git a/examples/stm32/f1/obldc/usart/usart.c b/examples/stm32/f1/obldc/usart/usart.c
index d5b4a01..36633bf 100644
--- a/examples/stm32/f1/obldc/usart/usart.c
+++ b/examples/stm32/f1/obldc/usart/usart.c
@@ -23,7 +23,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOA clock (for LED GPIOs). */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/obldc/usart_irq/usart_irq.c b/examples/stm32/f1/obldc/usart_irq/usart_irq.c
index c515824..e9f679f 100644
--- a/examples/stm32/f1/obldc/usart_irq/usart_irq.c
+++ b/examples/stm32/f1/obldc/usart_irq/usart_irq.c
@@ -24,7 +24,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOA clock (for LED GPIOs). */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/other/adc_temperature_sensor/adc.c b/examples/stm32/f1/other/adc_temperature_sensor/adc.c
index 31552b8..7085c0b 100644
--- a/examples/stm32/f1/other/adc_temperature_sensor/adc.c
+++ b/examples/stm32/f1/other/adc_temperature_sensor/adc.c
@@ -110,7 +110,7 @@ int main(void)
 	uint8_t channel_array[16];
 	uint16_t temperature;
 
-	rcc_clock_setup_in_hse_16mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
 	gpio_setup();
 	usart_setup();
 	adc_setup();
diff --git a/examples/stm32/f1/other/dma_mem2mem/dma.c b/examples/stm32/f1/other/dma_mem2mem/dma.c
index 9b70175..34d81a4 100644
--- a/examples/stm32/f1/other/dma_mem2mem/dma.c
+++ b/examples/stm32/f1/other/dma_mem2mem/dma.c
@@ -74,7 +74,7 @@ int main(void)
 	char s1[20] = "Hello STM MEM2MEM\r\n";
 	char s2[20];
 
-	rcc_clock_setup_in_hse_16mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
 	gpio_setup();
 	usart_setup();
 
diff --git a/examples/stm32/f1/other/dogm128/main.c b/examples/stm32/f1/other/dogm128/main.c
index e06a147..3af997a 100644
--- a/examples/stm32/f1/other/dogm128/main.c
+++ b/examples/stm32/f1/other/dogm128/main.c
@@ -79,7 +79,7 @@ static void spi_setup(void)
 
 int main(void)
 {
-	rcc_clock_setup_in_hse_16mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
 	gpio_setup();
 	spi_setup();
 
diff --git a/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
index dab2151..f4a8cd7 100644
--- a/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
+++ b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
@@ -107,7 +107,7 @@ int main(void)
 	int i = 0;
 	uint16_t temperature;
 
-	rcc_clock_setup_in_hse_16mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
 	gpio_setup();
 	usart_setup();
 	i2c_setup();
diff --git a/examples/stm32/f1/other/systick/systick.c b/examples/stm32/f1/other/systick/systick.c
index 09e1f48..174abcd 100644
--- a/examples/stm32/f1/other/systick/systick.c
+++ b/examples/stm32/f1/other/systick/systick.c
@@ -50,7 +50,7 @@ void sys_tick_handler(void)
 
 int main(void)
 {
-	rcc_clock_setup_in_hse_16mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
 	gpio_setup();
 
 	gpio_clear(GPIOB, GPIO7);	/* LED1 on */
diff --git a/examples/stm32/f1/other/timer_interrupt/timer.c b/examples/stm32/f1/other/timer_interrupt/timer.c
index 77ff030..0320a93 100644
--- a/examples/stm32/f1/other/timer_interrupt/timer.c
+++ b/examples/stm32/f1/other/timer_interrupt/timer.c
@@ -50,7 +50,7 @@ void tim2_isr(void)
 
 int main(void)
 {
-	rcc_clock_setup_in_hse_16mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
 	gpio_setup();
 	nvic_setup();
 
diff --git a/examples/stm32/f1/other/usb_cdcacm/cdcacm.c b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c
index 405ce96..120cca9 100644
--- a/examples/stm32/f1/other/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c
@@ -234,7 +234,7 @@ int main(void)
 {
 	usbd_device *usbd_dev;
 
-	rcc_clock_setup_in_hsi_out_48mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOA);
 	rcc_periph_clock_enable(RCC_AFIO);
diff --git a/examples/stm32/f1/other/usb_dfu/usbdfu.c b/examples/stm32/f1/other/usb_dfu/usbdfu.c
index 3a31004..700a4dc 100644
--- a/examples/stm32/f1/other/usb_dfu/usbdfu.c
+++ b/examples/stm32/f1/other/usb_dfu/usbdfu.c
@@ -258,7 +258,7 @@ int main(void)
 		}
 	}
 
-	rcc_clock_setup_in_hsi_out_48mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOA);
 	rcc_periph_clock_enable(RCC_AFIO);
diff --git a/examples/stm32/f1/other/usb_hid/usbhid.c b/examples/stm32/f1/other/usb_hid/usbhid.c
index 14694c5..860357c 100644
--- a/examples/stm32/f1/other/usb_hid/usbhid.c
+++ b/examples/stm32/f1/other/usb_hid/usbhid.c
@@ -276,7 +276,7 @@ static void hid_set_config(usbd_device *dev, uint16_t wValue)
 
 int main(void)
 {
-	rcc_clock_setup_in_hsi_out_48mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOA);
 	/*
diff --git a/examples/stm32/f1/stm32-h103/button/button.c b/examples/stm32/f1/stm32-h103/button/button.c
index afbd2ee..f2a11ff 100644
--- a/examples/stm32/f1/stm32-h103/button/button.c
+++ b/examples/stm32/f1/stm32-h103/button/button.c
@@ -26,7 +26,7 @@
 /* Set STM32 to 72 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/exti_both/exti_both.c b/examples/stm32/f1/stm32-h103/exti_both/exti_both.c
index 16b9903..0b2c6bd 100644
--- a/examples/stm32/f1/stm32-h103/exti_both/exti_both.c
+++ b/examples/stm32/f1/stm32-h103/exti_both/exti_both.c
@@ -28,7 +28,7 @@ uint16_t exti_line_state;
 /* Set STM32 to 72 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.c b/examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
index 438d266..ca779b6 100644
--- a/examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
+++ b/examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
@@ -31,7 +31,7 @@ uint16_t exti_direction = FALLING;
 /* Set STM32 to 72 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/fancyblink/fancyblink.c b/examples/stm32/f1/stm32-h103/fancyblink/fancyblink.c
index 4948e5c..bbd8089 100644
--- a/examples/stm32/f1/stm32-h103/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/stm32-h103/fancyblink/fancyblink.c
@@ -23,7 +23,7 @@
 /* Set STM32 to 72 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32-h103/led_stripe/led_stripe.c b/examples/stm32/f1/stm32-h103/led_stripe/led_stripe.c
index 74794e4..f610d12 100644
--- a/examples/stm32/f1/stm32-h103/led_stripe/led_stripe.c
+++ b/examples/stm32/f1/stm32-h103/led_stripe/led_stripe.c
@@ -65,7 +65,7 @@ struct color {
 /* Set STM32 to 72 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOB and GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c b/examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c
index b09112f..6b3eb78 100644
--- a/examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c
+++ b/examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c
@@ -30,7 +30,7 @@ uint16_t exti_direction = FALLING;
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/rtc/rtc.c b/examples/stm32/f1/stm32-h103/rtc/rtc.c
index e4207fd..39a8e72 100644
--- a/examples/stm32/f1/stm32-h103/rtc/rtc.c
+++ b/examples/stm32/f1/stm32-h103/rtc/rtc.c
@@ -26,7 +26,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32-h103/timer/timer.c b/examples/stm32/f1/stm32-h103/timer/timer.c
index 843883c..8aa5ff5 100644
--- a/examples/stm32/f1/stm32-h103/timer/timer.c
+++ b/examples/stm32/f1/stm32-h103/timer/timer.c
@@ -62,7 +62,7 @@ int frequency_sel = 0;
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/traceswo/traceswo.c b/examples/stm32/f1/stm32-h103/traceswo/traceswo.c
index 8ca27eb..ed688c6 100644
--- a/examples/stm32/f1/stm32-h103/traceswo/traceswo.c
+++ b/examples/stm32/f1/stm32-h103/traceswo/traceswo.c
@@ -27,7 +27,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32-h103/usart/usart.c b/examples/stm32/f1/stm32-h103/usart/usart.c
index b7b6234..537d874 100644
--- a/examples/stm32/f1/stm32-h103/usart/usart.c
+++ b/examples/stm32/f1/stm32-h103/usart/usart.c
@@ -23,7 +23,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c b/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c
index 5dd872b..e2b5963 100644
--- a/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c
+++ b/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c
@@ -24,7 +24,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOA clock (for LED GPIOs). */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c b/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
index 96a1d4f..81c862e 100644
--- a/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
+++ b/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
@@ -117,7 +117,7 @@ int _write(int file, char *ptr, int len);
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOA clock (for LED GPIOs). */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c b/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c
index ced7909..b508878 100644
--- a/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c
+++ b/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c
@@ -29,7 +29,7 @@ int _write(int file, char *ptr, int len);
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOA clock (for LED GPIOs). */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c b/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
index b46538d..aca04d5 100644
--- a/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
@@ -237,7 +237,7 @@ int main(void)
 
 	usbd_device *usbd_dev;
 
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOC);
 
diff --git a/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
index 1ac4fba..2dada99 100644
--- a/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
+++ b/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
@@ -258,7 +258,7 @@ int main(void)
 		}
 	}
 
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOC);
 
diff --git a/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c b/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
index f385e05..378051a 100644
--- a/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
+++ b/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
@@ -259,7 +259,7 @@ int main(void)
 		}
 	}
 
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOA);
 	rcc_periph_clock_enable(RCC_AFIO);
diff --git a/examples/stm32/f1/stm32-h107/fancyblink/fancyblink.c b/examples/stm32/f1/stm32-h107/fancyblink/fancyblink.c
index e339328..c9bcf2e 100644
--- a/examples/stm32/f1/stm32-h107/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/stm32-h107/fancyblink/fancyblink.c
@@ -24,7 +24,7 @@
 /* Set STM32 to 72 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_25mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE25_72MHZ]);
 
 	/* Enable GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32-h107/flash_rw_example/flash_rw_example.c b/examples/stm32/f1/stm32-h107/flash_rw_example/flash_rw_example.c
index e98f0c7..0c46600 100644
--- a/examples/stm32/f1/stm32-h107/flash_rw_example/flash_rw_example.c
+++ b/examples/stm32/f1/stm32-h107/flash_rw_example/flash_rw_example.c
@@ -80,7 +80,7 @@ int main(void)
 static void init_system(void)
 {
 	/* setup SYSCLK to work with 64Mhz HSI */
-	rcc_clock_setup_in_hsi_out_64mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_64MHZ]);
 	init_usart();
 }
 
diff --git a/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c b/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
index ca71581..2be5801 100644
--- a/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
+++ b/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
@@ -110,7 +110,7 @@ int main(void)
 {
 	usbd_device *usbd_dev;
 
-	rcc_clock_setup_in_hse_25mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE25_72MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOA);
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32-maple/usart/usart.c b/examples/stm32/f1/stm32-maple/usart/usart.c
index 22397c7..10c7d67 100644
--- a/examples/stm32/f1/stm32-maple/usart/usart.c
+++ b/examples/stm32/f1/stm32-maple/usart/usart.c
@@ -23,7 +23,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOA clock. */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/stm32-maple/usart_irq/usart_irq.c b/examples/stm32/f1/stm32-maple/usart_irq/usart_irq.c
index 243bb09..6090950 100644
--- a/examples/stm32/f1/stm32-maple/usart_irq/usart_irq.c
+++ b/examples/stm32/f1/stm32-maple/usart_irq/usart_irq.c
@@ -25,7 +25,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	/* Enable GPIOA clock. */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c b/examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c
index a67ef00..2678f61 100644
--- a/examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c
@@ -240,7 +240,7 @@ int main(void)
 
 	SCB_VTOR = (uint32_t) 0x08005000;
 
-	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOA);
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c b/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c
index 784aad3..e4ba397 100644
--- a/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c
+++ b/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c
@@ -37,7 +37,7 @@ int _write(int file, char *ptr, int len);
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hsi_out_24mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_24MHZ]);
 	/* Enable clocks for USART2 and DAC*/
 	rcc_periph_clock_enable(RCC_USART2);
 	rcc_periph_clock_enable(RCC_DAC);
diff --git a/examples/stm32/f1/stm32vl-discovery/button/button.c b/examples/stm32/f1/stm32vl-discovery/button/button.c
index 46db5b2..5d74c49 100644
--- a/examples/stm32/f1/stm32vl-discovery/button/button.c
+++ b/examples/stm32/f1/stm32vl-discovery/button/button.c
@@ -24,7 +24,7 @@
 /* Set STM32 to 24 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_24mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/stm32vl-discovery/fancyblink/fancyblink.c b/examples/stm32/f1/stm32vl-discovery/fancyblink/fancyblink.c
index 2d9e125..8ada612 100644
--- a/examples/stm32/f1/stm32vl-discovery/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/stm32vl-discovery/fancyblink/fancyblink.c
@@ -25,7 +25,7 @@
 /* Set STM32 to 24 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_24mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
 
 	/* Enable GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32vl-discovery/rtc/rtc.c b/examples/stm32/f1/stm32vl-discovery/rtc/rtc.c
index 4f14064..f4d72ee 100644
--- a/examples/stm32/f1/stm32vl-discovery/rtc/rtc.c
+++ b/examples/stm32/f1/stm32vl-discovery/rtc/rtc.c
@@ -27,7 +27,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_24mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
 
 	/* Enable GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/stm32vl-discovery/spi/spi.c b/examples/stm32/f1/stm32vl-discovery/spi/spi.c
index f6477c2..1150217 100644
--- a/examples/stm32/f1/stm32vl-discovery/spi/spi.c
+++ b/examples/stm32/f1/stm32vl-discovery/spi/spi.c
@@ -30,7 +30,7 @@ int _write(int file, char *ptr, int len);
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_24mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
 
 	/* Enable GPIOA, GPIOB, GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f1/stm32vl-discovery/usart/usart.c b/examples/stm32/f1/stm32vl-discovery/usart/usart.c
index 395635a..41c12e0 100644
--- a/examples/stm32/f1/stm32vl-discovery/usart/usart.c
+++ b/examples/stm32/f1/stm32vl-discovery/usart/usart.c
@@ -23,7 +23,7 @@
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_24mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
 
 	/* Enable GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/waveshare-open103r/button/button.c b/examples/stm32/f1/waveshare-open103r/button/button.c
index 18d246f..c7a2144 100644
--- a/examples/stm32/f1/waveshare-open103r/button/button.c
+++ b/examples/stm32/f1/waveshare-open103r/button/button.c
@@ -25,7 +25,7 @@
 /* Set STM32 to 24 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_24mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/waveshare-open103r/fancyblink/fancyblink.c b/examples/stm32/f1/waveshare-open103r/fancyblink/fancyblink.c
index ce02958..12612b6 100644
--- a/examples/stm32/f1/waveshare-open103r/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/waveshare-open103r/fancyblink/fancyblink.c
@@ -26,7 +26,7 @@
 /* Set STM32 to 24 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_in_hse_8mhz_out_24mhz();
+	rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
 
 	/* Enable GPIOC clock. */
 	rcc_periph_clock_enable(RCC_GPIOC);
diff --git a/examples/stm32/f1/waveshare-open103r/joystick/joystick.c b/examples/stm32/f1/waveshare-open103r/joystick/joystick.c
index c4272d3..720a262 100644
--- a/examples/stm32/f1/waveshare-open103r/joystick/joystick.c
+++ b/examples/stm32/f1/waveshare-open103r/joystick/joystick.c
@@ -47,7 +47,7 @@ bool led_blinking;
 /* Set STM32 to 24 MHz. */
 static void clock_setup(void)
 {
-  rcc_clock_setup_in_hse_8mhz_out_24mhz();
+  rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
 }
 
 static void led_setup(void)
diff --git a/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c b/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c
index 44639de..62cf86c 100644
--- a/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c
+++ b/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c
@@ -245,7 +245,7 @@ int main(void)
 {
   usbd_device *usbd_dev;
 
-  rcc_clock_setup_in_hsi_out_48mhz();
+  rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
   rcc_periph_clock_enable(RCC_AFIO);
 
   AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;