aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/native
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/native
parentb07ffffcee53e18051b324eb59a2794044ce6f95 (diff)
Factor out timing routines common to all STM32 targets.
Diffstat (limited to 'src/platforms/native')
-rw-r--r--src/platforms/native/Makefile.inc1
-rw-r--r--src/platforms/native/platform.c29
-rw-r--r--src/platforms/native/platform.h4
3 files changed, 3 insertions, 31 deletions
diff --git a/src/platforms/native/Makefile.inc b/src/platforms/native/Makefile.inc
index 2270ff5..8b76a53 100644
--- a/src/platforms/native/Makefile.inc
+++ b/src/platforms/native/Makefile.inc
@@ -19,6 +19,7 @@ SRC += cdcacm.c \
traceswo.c \
usbuart.c \
serialno.c \
+ timing.c \
all: blackmagic.bin blackmagic_dfu.bin blackmagic_dfu.hex
diff --git a/src/platforms/native/platform.c b/src/platforms/native/platform.c
index 5c28747..ac54b4b 100644
--- a/src/platforms/native/platform.c
+++ b/src/platforms/native/platform.c
@@ -28,7 +28,6 @@
#include "morse.h"
#include <libopencm3/stm32/f1/rcc.h>
-#include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/scb.h>
#include <libopencm3/cm3/nvic.h>
#include <libopencm3/stm32/exti.h>
@@ -36,9 +35,6 @@
#include <libopencm3/usb/usbd.h>
#include <libopencm3/stm32/f1/adc.h>
-uint8_t running_status;
-volatile uint32_t timeout_counter;
-
jmp_buf fatal_error_jmpbuf;
static void adc_init(void);
@@ -115,14 +111,6 @@ void platform_init(void)
GPIO_CNF_INPUT_PULL_UPDOWN, PWR_BR_PIN);
}
- /* 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();
-
if (platform_hwversion() > 0) {
adc_init();
} else {
@@ -133,6 +121,7 @@ void platform_init(void)
/* Relocate interrupt vector table here */
SCB_VTOR = 0x2000;
+ platform_timing_init();
cdcacm_init();
usbuart_init();
setup_vbus_irq();
@@ -161,22 +150,6 @@ void platform_target_set_power(bool power)
gpio_set_val(PWR_BR_PORT, PWR_BR_PIN, !power);
}
}
-void platform_delay(uint32_t delay)
-{
- timeout_counter = delay;
- while(timeout_counter);
-}
-
-void sys_tick_handler(void)
-{
- if(running_status)
- gpio_toggle(LED_PORT, LED_IDLE_RUN);
-
- if(timeout_counter)
- timeout_counter--;
-
- SET_ERROR_STATE(morse_update());
-}
static void adc_init(void)
{
diff --git a/src/platforms/native/platform.h b/src/platforms/native/platform.h
index c0b4dba..ae9bcef 100644
--- a/src/platforms/native/platform.h
+++ b/src/platforms/native/platform.h
@@ -27,6 +27,7 @@
#include "gdb_packet.h"
#include "gpio.h"
#include "morse.h"
+#include "timing.h"
#include <setjmp.h>
@@ -146,9 +147,6 @@
#define DEBUG(...)
-extern uint8_t running_status;
-extern volatile uint32_t timeout_counter;
-
extern jmp_buf fatal_error_jmpbuf;
#define SET_RUN_STATE(state) {running_status = (state);}