aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/f4discovery
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/f4discovery
parentb07ffffcee53e18051b324eb59a2794044ce6f95 (diff)
Factor out timing routines common to all STM32 targets.
Diffstat (limited to 'src/platforms/f4discovery')
-rw-r--r--src/platforms/f4discovery/Makefile.inc1
-rw-r--r--src/platforms/f4discovery/platform.c30
-rw-r--r--src/platforms/f4discovery/platform.h4
3 files changed, 3 insertions, 32 deletions
diff --git a/src/platforms/f4discovery/Makefile.inc b/src/platforms/f4discovery/Makefile.inc
index 21b4078..d8f7754 100644
--- a/src/platforms/f4discovery/Makefile.inc
+++ b/src/platforms/f4discovery/Makefile.inc
@@ -20,6 +20,7 @@ SRC += cdcacm.c \
traceswo.c \
usbuart.c \
serialno.c \
+ timing.c \
all: blackmagic.bin
diff --git a/src/platforms/f4discovery/platform.c b/src/platforms/f4discovery/platform.c
index 6e10ff4..e85ebd5 100644
--- a/src/platforms/f4discovery/platform.c
+++ b/src/platforms/f4discovery/platform.c
@@ -28,7 +28,6 @@
#include "morse.h"
#include <libopencm3/stm32/f4/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/stm32/syscfg.h>
#include <libopencm3/usb/usbd.h>
-uint8_t running_status;
-volatile uint32_t timeout_counter;
-
jmp_buf fatal_error_jmpbuf;
void platform_init(void)
@@ -77,35 +73,11 @@ void platform_init(void)
GPIO_PUPD_NONE,
LED_UART | LED_IDLE_RUN | LED_ERROR | LED_BOOTLOADER);
- /* Setup heartbeat timer */
- systick_set_clocksource(STK_CSR_CLKSOURCE_AHB_DIV8);
- systick_set_reload(168000000/(10*8)); /* Interrupt us at 10 Hz */
- SCB_SHPR(11) &= ~((15 << 4) & 0xff);
- SCB_SHPR(11) |= ((14 << 4) & 0xff);
- systick_interrupt_enable();
- systick_counter_enable();
-
+ platform_timing_init();
usbuart_init();
cdcacm_init();
}
-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());
-}
-
const char *platform_target_voltage(void)
{
return "ABSENT!";
diff --git a/src/platforms/f4discovery/platform.h b/src/platforms/f4discovery/platform.h
index 61753af..3c5c582 100644
--- a/src/platforms/f4discovery/platform.h
+++ b/src/platforms/f4discovery/platform.h
@@ -27,6 +27,7 @@
#include "gdb_packet.h"
#include "gpio.h"
#include "morse.h"
+#include "timing.h"
#include <setjmp.h>
@@ -140,9 +141,6 @@
#define DEBUG(...)
-extern uint8_t running_status;
-extern volatile uint32_t timeout_counter;
-
extern jmp_buf fatal_error_jmpbuf;
#define gpio_set_val(port, pin, val) do { \