aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/stlink
diff options
context:
space:
mode:
authorGareth McMullin2015-03-02 21:59:04 -0800
committerGareth McMullin2015-03-02 21:59:04 -0800
commit3e466f2d23401df610cb0f94a226317c2dc38751 (patch)
tree7225d3f7929044ced05872d0d11dfd3501605603 /src/platforms/stlink
parentb07ffffcee53e18051b324eb59a2794044ce6f95 (diff)
Factor out timing routines common to all STM32 targets.
Diffstat (limited to 'src/platforms/stlink')
-rw-r--r--src/platforms/stlink/Makefile.inc1
-rw-r--r--src/platforms/stlink/platform.c28
-rw-r--r--src/platforms/stlink/platform.h6
3 files changed, 6 insertions, 29 deletions
diff --git a/src/platforms/stlink/Makefile.inc b/src/platforms/stlink/Makefile.inc
index 52ad33b..f2ebce5 100644
--- a/src/platforms/stlink/Makefile.inc
+++ b/src/platforms/stlink/Makefile.inc
@@ -18,6 +18,7 @@ SRC += cdcacm.c \
platform.c \
usbuart.c \
serialno.c \
+ timing.c \
all: blackmagic.bin blackmagic_dfu.bin blackmagic_dfu.hex dfu_upgrade.bin dfu_upgrade.hex
diff --git a/src/platforms/stlink/platform.c b/src/platforms/stlink/platform.c
index 446fb47..fb10faa 100644
--- a/src/platforms/stlink/platform.c
+++ b/src/platforms/stlink/platform.c
@@ -27,7 +27,6 @@
#include "usbuart.h"
#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/scb.h>
#include <libopencm3/cm3/nvic.h>
#include <libopencm3/stm32/usart.h>
@@ -104,25 +103,11 @@ void platform_init(void)
gpio_set_mode(LED_PORT, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, led_idle_run);
- /* Setup heartbeat timer */
- systick_set_clocksource(STK_CSR_CLKSOURCE_AHB_DIV8);
- systick_set_reload(900000); /* Interrupt us at 10 Hz */
- SCB_SHPR(11) &= ~((15 << 4) & 0xff);
- SCB_SHPR(11) |= ((14 << 4) & 0xff);
- systick_interrupt_enable();
- systick_counter_enable();
-
- usbuart_init();
-
SCB_VTOR = 0x2000; /* Relocate interrupt vector table here */
+ platform_timing_init();
cdcacm_init();
-}
-
-void platform_delay(uint32_t delay)
-{
- timeout_counter = delay;
- while (timeout_counter);
+ usbuart_init();
}
void platform_srst_set_val(bool assert)
@@ -135,15 +120,6 @@ void platform_srst_set_val(bool assert)
gpio_set(SRST_PORT, pin);
}
-void sys_tick_handler(void)
-{
- if(running_status)
- gpio_toggle(LED_PORT, led_idle_run);
-
- if(timeout_counter)
- timeout_counter--;
-}
-
const char *platform_target_voltage(void)
{
return "unknown";
diff --git a/src/platforms/stlink/platform.h b/src/platforms/stlink/platform.h
index fcbe259..f026db3 100644
--- a/src/platforms/stlink/platform.h
+++ b/src/platforms/stlink/platform.h
@@ -26,6 +26,7 @@
#include "gdb_packet.h"
#include "gpio.h"
+#include "timing.h"
#include <libopencm3/cm3/common.h>
#include <libopencm3/stm32/f1/memorymap.h>
@@ -129,14 +130,13 @@
#define DEBUG(...)
-extern uint8_t running_status;
-extern volatile uint32_t timeout_counter;
-
extern jmp_buf fatal_error_jmpbuf;
extern uint16_t led_idle_run;
+#define LED_IDLE_RUN led_idle_run
#define SET_RUN_STATE(state) {running_status = (state);}
#define SET_IDLE_STATE(state) {gpio_set_val(LED_PORT, led_idle_run, state);}
+#define SET_ERROR_STATE(x)
#define PLATFORM_SET_FATAL_ERROR_RECOVERY() {setjmp(fatal_error_jmpbuf);}
#define PLATFORM_FATAL_ERROR(error) do { \