aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/f4discovery
diff options
context:
space:
mode:
Diffstat (limited to 'src/platforms/f4discovery')
-rw-r--r--src/platforms/f4discovery/platform.c22
-rw-r--r--src/platforms/f4discovery/platform.h14
-rw-r--r--src/platforms/f4discovery/usbdfu.c6
3 files changed, 11 insertions, 31 deletions
diff --git a/src/platforms/f4discovery/platform.c b/src/platforms/f4discovery/platform.c
index e051564..cf6cdf3 100644
--- a/src/platforms/f4discovery/platform.c
+++ b/src/platforms/f4discovery/platform.c
@@ -22,7 +22,11 @@
* implementation.
*/
-#include "platform.h"
+#include "general.h"
+#include "cdcacm.h"
+#include "usbuart.h"
+#include "morse.h"
+
#include <libopencm3/stm32/f4/rcc.h>
#include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/scb.h>
@@ -32,16 +36,12 @@
#include <libopencm3/stm32/syscfg.h>
#include <libopencm3/usb/usbd.h>
-#include "jtag_scan.h"
-#include "usbuart.h"
-#include "morse.h"
-
uint8_t running_status;
volatile uint32_t timeout_counter;
jmp_buf fatal_error_jmpbuf;
-int platform_init(void)
+void platform_init(void)
{
/* Check the USER button*/
rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPAEN);
@@ -86,17 +86,7 @@ int platform_init(void)
systick_counter_enable();
usbuart_init();
-
cdcacm_init();
-
- // Set recovery point
- if (setjmp(fatal_error_jmpbuf)) {
- return 0; // Do nothing on failure
- }
-
- jtag_scan(NULL);
-
- return 0;
}
void platform_delay(uint32_t delay)
diff --git a/src/platforms/f4discovery/platform.h b/src/platforms/f4discovery/platform.h
index 140e8d1..f58205d 100644
--- a/src/platforms/f4discovery/platform.h
+++ b/src/platforms/f4discovery/platform.h
@@ -24,19 +24,12 @@
#ifndef __PLATFORM_H
#define __PLATFORM_H
-#include <stdint.h>
-#include <libopencm3/cm3/common.h>
-#include <libopencm3/stm32/f4/memorymap.h>
-#include <libopencm3/stm32/f4/gpio.h>
-#include <libopencm3/usb/usbd.h>
-
-#include <setjmp.h>
-#include <alloca.h>
-
#include "gdb_packet.h"
#include "gpio.h"
#include "morse.h"
+#include <setjmp.h>
+
#define PLATFORM_HAS_TRACESWO
#define BOARD_IDENT "Black Magic Probe (F4Discovery), (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
#define BOARD_IDENT_DFU "Black Magic (Upgrade) for F4Discovery, (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
@@ -173,9 +166,6 @@ extern jmp_buf fatal_error_jmpbuf;
longjmp(fatal_error_jmpbuf, (error)); \
}
-int platform_init(void);
-const char *platform_target_voltage(void);
-void platform_delay(uint32_t delay);
static inline int platform_hwversion(void)
{
return 0;
diff --git a/src/platforms/f4discovery/usbdfu.c b/src/platforms/f4discovery/usbdfu.c
index 7070ade..6a40295 100644
--- a/src/platforms/f4discovery/usbdfu.c
+++ b/src/platforms/f4discovery/usbdfu.c
@@ -17,14 +17,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <string.h>
+#include "general.h"
+#include "usbdfu.h"
+
#include <libopencm3/cm3/systick.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/cm3/scb.h>
-#include "usbdfu.h"
-
void dfu_detach(void)
{
/* USB device must detach, we just reset... */