aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/native
diff options
context:
space:
mode:
authorGareth McMullin2015-03-01 22:16:04 -0800
committerGareth McMullin2015-03-01 22:16:04 -0800
commit4d4813de87721528fc9a06174dd1da5c245ae2f3 (patch)
tree298266ed212f574b51d21d5b3fa18d37a4388907 /src/platforms/native
parent9d80641261cee52fdf1976caa41d4fd24c392c9a (diff)
Clean up includes everywhere.
All source files include general.h first and before anything else. This inlcludes platform.h and platform_support.h No header file needs to include to include any of these, but should include any others needed for it's own declarations.
Diffstat (limited to 'src/platforms/native')
-rw-r--r--src/platforms/native/platform.c22
-rw-r--r--src/platforms/native/platform.h22
2 files changed, 7 insertions, 37 deletions
diff --git a/src/platforms/native/platform.c b/src/platforms/native/platform.c
index 3f61f5f..9b39238 100644
--- a/src/platforms/native/platform.c
+++ b/src/platforms/native/platform.c
@@ -22,7 +22,10 @@
* implementation.
*/
-#include "platform.h"
+#include "general.h"
+#include "cdcacm.h"
+#include "usbuart.h"
+#include "morse.h"
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/cm3/systick.h>
@@ -33,11 +36,6 @@
#include <libopencm3/usb/usbd.h>
#include <libopencm3/stm32/f1/adc.h>
-#include "jtag_scan.h"
-#include "cdcacm.h"
-#include "usbuart.h"
-#include "morse.h"
-
uint8_t running_status;
volatile uint32_t timeout_counter;
@@ -62,7 +60,7 @@ int platform_hwversion(void)
return hwversion;
}
-int platform_init(void)
+void platform_init(void)
{
rcc_clock_setup_in_hse_8mhz_out_72mhz();
@@ -136,16 +134,6 @@ int platform_init(void)
cdcacm_init();
usbuart_init();
-
- /* Set recovery point */
- if (setjmp(fatal_error_jmpbuf)) {
- /* Do nothing on failure */
- return 0;
- }
-
- jtag_scan(NULL);
-
- return 0;
}
void platform_srst_set_val(bool assert)
diff --git a/src/platforms/native/platform.h b/src/platforms/native/platform.h
index 321c3f3..5688e60 100644
--- a/src/platforms/native/platform.h
+++ b/src/platforms/native/platform.h
@@ -24,20 +24,12 @@
#ifndef __PLATFORM_H
#define __PLATFORM_H
-#include <stdint.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"
#include "morse.h"
+#include <setjmp.h>
+
#define PLATFORM_HAS_TRACESWO
#define PLATFORM_HAS_POWER_SWITCH
#define BOARD_IDENT "Black Magic Probe"
@@ -173,13 +165,6 @@ extern jmp_buf fatal_error_jmpbuf;
longjmp(fatal_error_jmpbuf, (error)); \
} while (0)
-int platform_init(void);
-const char *platform_target_voltage(void);
-int platform_hwversion(void);
-void platform_set_timeout(uint32_t ms);
-bool platform_timeout_expired(void);
-void platform_delay(uint32_t delay);
-
/* Use newlib provided integer only stdio functions */
#define sscanf siscanf
#define sprintf siprintf
@@ -188,9 +173,6 @@ void platform_delay(uint32_t delay);
#define disconnect_usb() gpio_set_mode(USB_PU_PORT, GPIO_MODE_INPUT, 0, USB_PU_PIN);
void assert_boot_pin(void);
void setup_vbus_irq(void);
-void platform_srst_set_val(bool assert);
-bool platform_target_get_power(void);
-void platform_target_set_power(bool power);
#endif