aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/stlink
diff options
context:
space:
mode:
Diffstat (limited to 'src/platforms/stlink')
-rw-r--r--src/platforms/stlink/platform.c22
-rw-r--r--src/platforms/stlink/platform.h16
2 files changed, 9 insertions, 29 deletions
diff --git a/src/platforms/stlink/platform.c b/src/platforms/stlink/platform.c
index 6ef8c77..6194d92 100644
--- a/src/platforms/stlink/platform.c
+++ b/src/platforms/stlink/platform.c
@@ -22,7 +22,10 @@
* implementation.
*/
-#include "platform.h"
+#include "general.h"
+#include "cdcacm.h"
+#include "usbuart.h"
+
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/scb.h>
@@ -31,11 +34,6 @@
#include <libopencm3/usb/usbd.h>
#include <libopencm3/stm32/adc.h>
-#include "jtag_scan.h"
-#include <usbuart.h>
-
-#include <ctype.h>
-
uint8_t running_status;
volatile uint32_t timeout_counter;
@@ -68,7 +66,7 @@ int platform_hwversion(void)
return hwversion;
}
-int platform_init(void)
+void platform_init(void)
{
rcc_clock_setup_in_hse_8mhz_out_72mhz();
@@ -119,16 +117,6 @@ int platform_init(void)
SCB_VTOR = 0x2000; /* Relocate interrupt vector table here */
cdcacm_init();
-
- /* Set recovery point */
- if (setjmp(fatal_error_jmpbuf)) {
- /* Do nothing on failure */
- return 0;
- }
-
- jtag_scan(NULL);
-
- return 0;
}
void platform_delay(uint32_t delay)
diff --git a/src/platforms/stlink/platform.h b/src/platforms/stlink/platform.h
index a33ca06..5768817 100644
--- a/src/platforms/stlink/platform.h
+++ b/src/platforms/stlink/platform.h
@@ -24,18 +24,14 @@
#ifndef __PLATFORM_H
#define __PLATFORM_H
-#include <stdint.h>
+#include "gdb_packet.h"
+#include "gpio.h"
+
#include <libopencm3/cm3/common.h>
#include <libopencm3/stm32/f1/memorymap.h>
-
-#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/usb/usbd.h>
#include <setjmp.h>
-#include <alloca.h>
-
-#include "gdb_packet.h"
-#include "gpio.h"
#define BOARD_IDENT "Black Magic Probe (STLINK), (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
#define BOARD_IDENT_DFU "Black Magic (Upgrade) for STLink/Discovery, (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
@@ -151,11 +147,6 @@ extern uint16_t led_idle_run;
longjmp(fatal_error_jmpbuf, (error)); \
} while (0)
-int platform_init(void);
-const char *platform_target_voltage(void);
-void platform_delay(uint32_t delay);
-void platform_srst_set_val(bool assert);
-
/* Use newlib provided integer only stdio functions */
#define sscanf siscanf
#define sprintf siprintf
@@ -163,6 +154,7 @@ void platform_srst_set_val(bool assert);
void disconnect_usb(void);
void assert_boot_pin(void);
+void setup_vbus_irq(void);
#endif