From dc58660653d3cd3a54cfc685db40f9077bddb4e3 Mon Sep 17 00:00:00 2001 From: "Hippo Spark (Arch)" Date: Thu, 9 Mar 2023 04:27:54 +0800 Subject: [PATCH] Replace the deprecated libopencm3 functions. --- src/stm32f103/bluepill/target.c | 3 ++- src/stm32f103/stlinkv2-1/target.c | 3 ++- src/stm32f103/stlinkv2-dongle/target.c | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/stm32f103/bluepill/target.c b/src/stm32f103/bluepill/target.c index 661f616..1d5fef0 100644 --- a/src/stm32f103/bluepill/target.c +++ b/src/stm32f103/bluepill/target.c @@ -29,7 +29,8 @@ void cpu_setup(void) { /* Set STM32 to 72 MHz. */ void clock_setup(void) { - rcc_clock_setup_in_hse_8mhz_out_72mhz(); + // rcc_clock_setup_in_hse_8mhz_out_72mhz(); + rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]); } void gpio_setup(void) { diff --git a/src/stm32f103/stlinkv2-1/target.c b/src/stm32f103/stlinkv2-1/target.c index f3f9dce..5dcd063 100644 --- a/src/stm32f103/stlinkv2-1/target.c +++ b/src/stm32f103/stlinkv2-1/target.c @@ -38,7 +38,8 @@ void cpu_setup(void) { /* Set STM32 to 72 MHz. */ void clock_setup(void) { - rcc_clock_setup_in_hse_8mhz_out_72mhz(); + // rcc_clock_setup_in_hse_8mhz_out_72mhz(); + rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]); } void gpio_setup(void) { diff --git a/src/stm32f103/stlinkv2-dongle/target.c b/src/stm32f103/stlinkv2-dongle/target.c index 180d5d6..20e7b93 100644 --- a/src/stm32f103/stlinkv2-dongle/target.c +++ b/src/stm32f103/stlinkv2-dongle/target.c @@ -29,12 +29,13 @@ void cpu_setup(void) { /* Set STM32 to 72 MHz. */ void clock_setup(void) { - rcc_clock_setup_in_hse_8mhz_out_72mhz(); + // rcc_clock_setup_in_hse_8mhz_out_72mhz(); + rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]); } void gpio_setup(void) { /* - LED0, 1, 2 on PA9, + LED0, 1, 2 on PA9, RX (MCU-side) on PB11 TGT_RST on PB6 TGT_SWDIO, TGT_SWCLK on PB14, PB13