sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to recent libopencm3 to undo unwanted change.

This commit is contained in:
Uwe Bonnes 2020-12-07 18:09:32 +01:00 committed by UweBonnes
parent 633c6a2e81
commit 98b4ec58bc
10 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libopencm3

@ -1 +1 @@
Subproject commit 505ac65c05b776af031dac3c15b69573b5709850
Subproject commit 8435287300e5ca9af9f889c529e7b1fa019c42fb

2
src/platforms/f4discovery/platform.c
View File

@ -27,7 +27,7 @@
#include "usbuart.h"
#include "morse.h"
#include <libopencm3/stm32/f4/rcc.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/cm3/scb.h>
#include <libopencm3/cm3/nvic.h>
#include <libopencm3/stm32/exti.h>

2
src/platforms/hydrabus/platform.c
View File

@ -27,7 +27,7 @@
#include "usbuart.h"
#include "morse.h"
#include <libopencm3/stm32/f4/rcc.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/cm3/scb.h>
#include <libopencm3/cm3/nvic.h>
#include <libopencm3/stm32/exti.h>

6
src/platforms/native/platform.c
View File

@ -27,14 +27,14 @@
#include "usbuart.h"
#include "morse.h"
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/cm3/scb.h>
#include <libopencm3/cm3/scs.h>
#include <libopencm3/cm3/nvic.h>
#include <libopencm3/stm32/exti.h>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/stm32/f1/adc.h>
#include <libopencm3/stm32/adc.h>
static void adc_init(void);
static void setup_vbus_irq(void);
@ -97,7 +97,7 @@ void platform_init(void)
initialise_monitor_handles();
#endif
rcc_clock_setup_in_hse_8mhz_out_72mhz();
rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable peripherals */
rcc_periph_clock_enable(RCC_USB);

2
src/platforms/native/usbdfu.c
View File

@ -44,7 +44,7 @@ int main(void)
dfu_protect(false);
rcc_clock_setup_in_hse_8mhz_out_72mhz();
rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
systick_set_clocksource(STK_CSR_CLKSOURCE_AHB_DIV8);
systick_set_reload(900000);

2
src/platforms/stlink/platform.c
View File

@ -52,7 +52,7 @@ void platform_init(void)
void initialise_monitor_handles(void);
initialise_monitor_handles();
#endif
rcc_clock_setup_in_hse_8mhz_out_72mhz();
rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
if (rev == 0) {
led_idle_run = GPIO8;
srst_pin = SRST_PIN_V1;

2
src/platforms/stlink/platform.h
View File

@ -29,7 +29,7 @@
#include "timing_stm32.h"
#include <libopencm3/cm3/common.h>
#include <libopencm3/stm32/f1/memorymap.h>
#include <libopencm3/stm32/memorymap.h>
#include <libopencm3/usb/usbd.h>
#ifdef ENABLE_DEBUG

2
src/platforms/stlink/usbdfu.c
View File

@ -65,7 +65,7 @@ int main(void)
dfu_jump_app_if_valid();
dfu_protect(false);
rcc_clock_setup_in_hse_8mhz_out_72mhz();
rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
systick_set_clocksource(STK_CSR_CLKSOURCE_AHB_DIV8);
systick_set_reload(900000);

7
src/platforms/swlink/platform.c
View File

@ -27,13 +27,13 @@
#include "cdcacm.h"
#include "usbuart.h"
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/cm3/scb.h>
#include <libopencm3/cm3/scs.h>
#include <libopencm3/cm3/nvic.h>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/stm32/f1/adc.h>
#include <libopencm3/stm32/adc.h>
uint32_t led_error_port;
uint16_t led_error_pin;
@ -54,8 +54,7 @@ void platform_init(void)
void initialise_monitor_handles(void);
initialise_monitor_handles();
#endif
rcc_clock_setup_in_hse_8mhz_out_72mhz();
rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
rev = detect_rev();
/* Enable peripherals */
rcc_periph_clock_enable(RCC_AFIO);

2
src/platforms/swlink/usbdfu.c
View File

@ -77,7 +77,7 @@ int main(void)
dfu_protect(false);
rcc_clock_setup_in_hse_8mhz_out_72mhz();
rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
systick_set_clocksource(STK_CSR_CLKSOURCE_AHB_DIV8);
systick_set_reload(900000);