aboutsummaryrefslogtreecommitdiff
path: root/src/platforms
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
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')
-rw-r--r--src/platforms/common/usbuart.h1
-rw-r--r--src/platforms/f4discovery/platform.c22
-rw-r--r--src/platforms/f4discovery/platform.h14
-rw-r--r--src/platforms/f4discovery/usbdfu.c6
-rw-r--r--src/platforms/launchpad-icdi/platform.c11
-rw-r--r--src/platforms/launchpad-icdi/platform.h16
-rw-r--r--src/platforms/libftdi/jtagtap.c1
-rw-r--r--src/platforms/libftdi/platform.c15
-rw-r--r--src/platforms/libftdi/platform.h5
-rw-r--r--src/platforms/libftdi/swdptap.c2
-rw-r--r--src/platforms/native/platform.c22
-rw-r--r--src/platforms/native/platform.h22
-rw-r--r--src/platforms/stlink/platform.c22
-rw-r--r--src/platforms/stlink/platform.h16
-rw-r--r--src/platforms/stm32/cdcacm.c2
-rw-r--r--src/platforms/stm32/dfu_f1.c5
-rw-r--r--src/platforms/stm32/dfu_f4.c6
-rw-r--r--src/platforms/stm32/dfucore.c2
-rw-r--r--src/platforms/stm32/gdb_if.c2
-rw-r--r--src/platforms/stm32/gpio.h10
-rw-r--r--src/platforms/stm32/jtagtap.c2
-rw-r--r--src/platforms/stm32/traceswo.c5
-rw-r--r--src/platforms/stm32/usbuart.c2
-rw-r--r--src/platforms/swlink/platform.c21
-rw-r--r--src/platforms/swlink/platform.h16
-rw-r--r--src/platforms/tm4c/cdcacm.c2
-rw-r--r--src/platforms/tm4c/gdb_if.c6
-rw-r--r--src/platforms/tm4c/jtagtap.c1
-rw-r--r--src/platforms/tm4c/swdptap.c1
-rw-r--r--src/platforms/tm4c/traceswo.c5
-rw-r--r--src/platforms/tm4c/usbuart.c4
31 files changed, 71 insertions, 196 deletions
diff --git a/src/platforms/common/usbuart.h b/src/platforms/common/usbuart.h
index 39f7dcd..51f5702 100644
--- a/src/platforms/common/usbuart.h
+++ b/src/platforms/common/usbuart.h
@@ -22,7 +22,6 @@
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/cdc.h>
-#include "general.h"
void usbuart_init(void);
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... */
diff --git a/src/platforms/launchpad-icdi/platform.c b/src/platforms/launchpad-icdi/platform.c
index 1e66e12..0e3fb85 100644
--- a/src/platforms/launchpad-icdi/platform.c
+++ b/src/platforms/launchpad-icdi/platform.c
@@ -1,5 +1,6 @@
-#include "platform.h"
+#include "general.h"
#include "gdb_if.h"
+#include "cdcacm.h"
#include "usbuart.h"
#include <libopencm3/lm4f/rcc.h>
@@ -26,14 +27,14 @@ void sys_tick_handler(void)
trace_tick();
}
-int
+void
platform_init(void)
{
int i;
for(i=0; i<1000000; i++);
rcc_sysclk_config(OSCSRC_MOSC, XTAL_16M, PLL_DIV_80MHZ);
-
+
// Enable all JTAG ports and set pins to output
periph_clock_enable(RCC_GPIOA);
periph_clock_enable(RCC_GPIOB);
@@ -59,10 +60,6 @@ platform_init(void)
usbuart_init();
cdcacm_init();
-
- //jtag_scan(NULL);
-
- return 0;
}
void platform_delay(uint32_t delay)
diff --git a/src/platforms/launchpad-icdi/platform.h b/src/platforms/launchpad-icdi/platform.h
index 8c343a8..5f686f4 100644
--- a/src/platforms/launchpad-icdi/platform.h
+++ b/src/platforms/launchpad-icdi/platform.h
@@ -1,16 +1,13 @@
#ifndef __PLATFORM_H
#define __PLATFORM_H
-#include <stdint.h>
+#include "gdb_packet.h"
#include <setjmp.h>
-#include <alloca.h>
#include <libopencm3/lm4f/gpio.h>
#include <libopencm3/usb/usbd.h>
-#include "gdb_packet.h"
-
#define CDCACM_PACKET_SIZE 64
#define BOARD_IDENT "Black Magic Probe (Launchpad ICDI), (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
#define BOARD_IDENT_DFU "Black Magic (Upgrade) for Launchpad, (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
@@ -110,8 +107,6 @@ extern usbd_driver lm4f_usb_driver;
#define PLATFORM_HAS_TRACESWO
-int platform_init(void);
-
inline static void gpio_set_val(uint32_t port, uint8_t pin, uint8_t val) {
gpio_write(port, pin, val == 0 ? 0 : 0xff);
}
@@ -120,15 +115,6 @@ inline static uint8_t gpio_get(uint32_t port, uint8_t pin) {
return !(gpio_read(port, pin) == 0);
}
-void platform_delay(uint32_t delay);
-const char *platform_target_voltage(void);
-
-/* <cdcacm.c> */
-void cdcacm_init(void);
-/* Returns current usb configuration, or 0 if not configured. */
-int cdcacm_get_config(void);
-int cdcacm_get_dtr(void);
-
#define disconnect_usb() do { usbd_disconnect(usbdev,1); nvic_disable_irq(USB_IRQ);} while(0)
#define setup_vbus_irq()
diff --git a/src/platforms/libftdi/jtagtap.c b/src/platforms/libftdi/jtagtap.c
index 91f6ae2..c9bc876 100644
--- a/src/platforms/libftdi/jtagtap.c
+++ b/src/platforms/libftdi/jtagtap.c
@@ -69,6 +69,7 @@ void jtagtap_reset(void)
void jtagtap_srst(bool assert)
{
+ (void)assert;
platform_buffer_flush();
//ftdi_write_data(ftdic, "\x80\x88\xAB", 3);
//usleep(1000);
diff --git a/src/platforms/libftdi/platform.c b/src/platforms/libftdi/platform.c
index 723efa3..e53f011 100644
--- a/src/platforms/libftdi/platform.c
+++ b/src/platforms/libftdi/platform.c
@@ -17,14 +17,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "platform.h"
+#include "general.h"
#include "gdb_if.h"
-#include "jtag_scan.h"
-#include <stdio.h>
-#include <string.h>
#include <assert.h>
-#include <unistd.h>
struct ftdi_context *ftdic;
@@ -121,7 +117,7 @@ static struct cable_desc_s {
},
};
-int platform_init(int argc, char **argv)
+void platform_init(int argc, char **argv)
{
int err;
int c;
@@ -149,7 +145,7 @@ int platform_init(int argc, char **argv)
if (index == sizeof(cable_desc)/sizeof(cable_desc[0])){
fprintf(stderr, "No cable matching %s found\n",cablename);
- return -1;
+ exit(-1);
}
if (cable_desc[index].dbus_data)
@@ -212,12 +208,7 @@ int platform_init(int argc, char **argv)
}
assert(ftdi_write_data(ftdic, ftdi_init, 9) == 9);
-
assert(gdb_if_init() == 0);
-
- jtag_scan(NULL);
-
- return 0;
}
void platform_buffer_flush(void)
diff --git a/src/platforms/libftdi/platform.h b/src/platforms/libftdi/platform.h
index a95a3f4..135b2e3 100644
--- a/src/platforms/libftdi/platform.h
+++ b/src/platforms/libftdi/platform.h
@@ -21,7 +21,6 @@
#ifndef __PLATFORM_H
#define __PLATFORM_H
-#include <stdint.h>
#include <ftdi.h>
#ifndef WIN32
@@ -42,10 +41,6 @@
extern struct ftdi_context *ftdic;
-int platform_init(int argc, char **argv);
-const char *platform_target_voltage(void);
-void platform_delay(uint32_t delay);
-
void platform_buffer_flush(void);
int platform_buffer_write(const uint8_t *data, int size);
int platform_buffer_read(uint8_t *data, int size);
diff --git a/src/platforms/libftdi/swdptap.c b/src/platforms/libftdi/swdptap.c
index ef350de..eb6e65e 100644
--- a/src/platforms/libftdi/swdptap.c
+++ b/src/platforms/libftdi/swdptap.c
@@ -26,7 +26,7 @@
#include <assert.h>
#include <ftdi.h>
-#include "platform.h"
+#include "general.h"
#include "swdptap.h"
static void swdptap_turnaround(uint8_t dir);
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
diff --git a/src/platforms/stlink/platform.c b/src/platforms/stlink/platform.c
index 6ef8c77..6194d92 100644
--- a/src/platforms/stlink/platform.c
+++ b/src/platforms/stlink/platform.c
@@ -22,7 +22,10 @@
* implementation.
*/
-#include "platform.h"
+#include "general.h"
+#include "cdcacm.h"
+#include "usbuart.h"
+
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/scb.h>
@@ -31,11 +34,6 @@
#include <libopencm3/usb/usbd.h>
#include <libopencm3/stm32/adc.h>
-#include "jtag_scan.h"
-#include <usbuart.h>
-
-#include <ctype.h>
-
uint8_t running_status;
volatile uint32_t timeout_counter;
@@ -68,7 +66,7 @@ int platform_hwversion(void)
return hwversion;
}
-int platform_init(void)
+void platform_init(void)
{
rcc_clock_setup_in_hse_8mhz_out_72mhz();
@@ -119,16 +117,6 @@ int platform_init(void)
SCB_VTOR = 0x2000; /* Relocate interrupt vector table here */
cdcacm_init();
-
- /* Set recovery point */
- if (setjmp(fatal_error_jmpbuf)) {
- /* Do nothing on failure */
- return 0;
- }
-
- jtag_scan(NULL);
-
- return 0;
}
void platform_delay(uint32_t delay)
diff --git a/src/platforms/stlink/platform.h b/src/platforms/stlink/platform.h
index a33ca06..5768817 100644
--- a/src/platforms/stlink/platform.h
+++ b/src/platforms/stlink/platform.h
@@ -24,18 +24,14 @@
#ifndef __PLATFORM_H
#define __PLATFORM_H
-#include <stdint.h>
+#include "gdb_packet.h"
+#include "gpio.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"
#define BOARD_IDENT "Black Magic Probe (STLINK), (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
#define BOARD_IDENT_DFU "Black Magic (Upgrade) for STLink/Discovery, (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
@@ -151,11 +147,6 @@ extern uint16_t led_idle_run;
longjmp(fatal_error_jmpbuf, (error)); \
} while (0)
-int platform_init(void);
-const char *platform_target_voltage(void);
-void platform_delay(uint32_t delay);
-void platform_srst_set_val(bool assert);
-
/* Use newlib provided integer only stdio functions */
#define sscanf siscanf
#define sprintf siprintf
@@ -163,6 +154,7 @@ void platform_srst_set_val(bool assert);
void disconnect_usb(void);
void assert_boot_pin(void);
+void setup_vbus_irq(void);
#endif
diff --git a/src/platforms/stm32/cdcacm.c b/src/platforms/stm32/cdcacm.c
index 074b534..577925a 100644
--- a/src/platforms/stm32/cdcacm.c
+++ b/src/platforms/stm32/cdcacm.c
@@ -33,7 +33,7 @@
#include <libopencm3/usb/dfu.h>
#include <stdlib.h>
-#include "platform.h"
+#include "general.h"
#include "gdb_if.h"
#include "cdcacm.h"
#if defined(PLATFORM_HAS_TRACESWO)
diff --git a/src/platforms/stm32/dfu_f1.c b/src/platforms/stm32/dfu_f1.c
index bb1e274..abbdbe6 100644
--- a/src/platforms/stm32/dfu_f1.c
+++ b/src/platforms/stm32/dfu_f1.c
@@ -16,12 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
-#include "platform.h"
+#include "general.h"
+#include "usbdfu.h"
#include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/cm3/scb.h>
-#include "usbdfu.h"
#define FLASH_OBP_RDP 0x1FFFF800
#define FLASH_OBP_WRP10 0x1FFFF808
diff --git a/src/platforms/stm32/dfu_f4.c b/src/platforms/stm32/dfu_f4.c
index 1065938..2ececa0 100644
--- a/src/platforms/stm32/dfu_f4.c
+++ b/src/platforms/stm32/dfu_f4.c
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
-#include "platform.h"
+#include "general.h"
+#include "usbdfu.h"
#if defined(STM32F2)
# include <libopencm3/stm32/f2/flash.h>
@@ -26,8 +26,6 @@
#endif
#include <libopencm3/cm3/scb.h>
-#include "usbdfu.h"
-
static uint32_t sector_addr[] = {
0x8000000, 0x8004000, 0x8008000, 0x800c000,
0x8010000, 0x8020000, 0x8040000, 0x8060000,
diff --git a/src/platforms/stm32/dfucore.c b/src/platforms/stm32/dfucore.c
index 77cef4e..7b733d7 100644
--- a/src/platforms/stm32/dfucore.c
+++ b/src/platforms/stm32/dfucore.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "platform.h"
+#include "general.h"
#include <string.h>
#if defined(STM32F1)
diff --git a/src/platforms/stm32/gdb_if.c b/src/platforms/stm32/gdb_if.c
index 6cc9084..286c66b 100644
--- a/src/platforms/stm32/gdb_if.c
+++ b/src/platforms/stm32/gdb_if.c
@@ -22,7 +22,7 @@
* Serial Debugging protocol is implemented. This implementation for STM32
* uses the USB CDC-ACM device bulk endpoints to implement the channel.
*/
-#include "platform.h"
+#include "general.h"
#include "cdcacm.h"
#include "gdb_if.h"
diff --git a/src/platforms/stm32/gpio.h b/src/platforms/stm32/gpio.h
index 035f3c9..ee8275e 100644
--- a/src/platforms/stm32/gpio.h
+++ b/src/platforms/stm32/gpio.h
@@ -20,6 +20,16 @@
#ifndef __GPIO_H
#define __GPIO_H
+#include <libopencm3/cm3/common.h>
+
+#ifndef STM32F4
+# include <libopencm3/stm32/f1/memorymap.h>
+# include <libopencm3/stm32/f1/gpio.h>
+#else
+# include <libopencm3/stm32/f4/memorymap.h>
+# include <libopencm3/stm32/f4/gpio.h>
+#endif
+
#define INLINE_GPIO
#define gpio_set_val(port, pin, val) do { \
diff --git a/src/platforms/stm32/jtagtap.c b/src/platforms/stm32/jtagtap.c
index 2d09b84..3c45a81 100644
--- a/src/platforms/stm32/jtagtap.c
+++ b/src/platforms/stm32/jtagtap.c
@@ -23,9 +23,7 @@
#include <stdio.h>
#include "general.h"
-
#include "jtagtap.h"
-#include "platform.h"
int jtagtap_init(void)
{
diff --git a/src/platforms/stm32/traceswo.c b/src/platforms/stm32/traceswo.c
index 29bae8f..a2e704d 100644
--- a/src/platforms/stm32/traceswo.c
+++ b/src/platforms/stm32/traceswo.c
@@ -32,15 +32,12 @@
* The core can then process the buffer to extract the frame.
*/
#include "general.h"
+#include "cdcacm.h"
#include <libopencm3/cm3/nvic.h>
#include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/f1/rcc.h>
-#include <string.h>
-#include "platform.h"
-#include "cdcacm.h"
-
void traceswo_init(void)
{
TRACE_TIM_CLK_EN();
diff --git a/src/platforms/stm32/usbuart.c b/src/platforms/stm32/usbuart.c
index 970a609..cce2904 100644
--- a/src/platforms/stm32/usbuart.c
+++ b/src/platforms/stm32/usbuart.c
@@ -27,7 +27,7 @@
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/cdc.h>
-#include "platform.h"
+#include "general.h"
#include "cdcacm.h"
#define USBUART_TIMER_FREQ_HZ 1000000U /* 1us per tick */
diff --git a/src/platforms/swlink/platform.c b/src/platforms/swlink/platform.c
index 853cbc9..168ba2a 100644
--- a/src/platforms/swlink/platform.c
+++ b/src/platforms/swlink/platform.c
@@ -22,7 +22,10 @@
* implementation.
*/
-#include "platform.h"
+#include "general.h"
+#include "cdcacm.h"
+#include "usbuart.h"
+
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/scb.h>
@@ -31,17 +34,12 @@
#include <libopencm3/usb/usbd.h>
#include <libopencm3/stm32/f1/adc.h>
-#include "jtag_scan.h"
-#include <usbuart.h>
-
-#include <ctype.h>
-
uint8_t running_status;
volatile uint32_t timeout_counter;
jmp_buf fatal_error_jmpbuf;
-int platform_init(void)
+void platform_init(void)
{
uint32_t data;
rcc_clock_setup_in_hse_8mhz_out_72mhz();
@@ -98,15 +96,6 @@ int platform_init(void)
SCB_VTOR = 0x2000; // Relocate interrupt vector table here
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/swlink/platform.h b/src/platforms/swlink/platform.h
index 26cb7a6..dec5548 100644
--- a/src/platforms/swlink/platform.h
+++ b/src/platforms/swlink/platform.h
@@ -24,19 +24,11 @@
#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 <setjmp.h>
+
#define BOARD_IDENT "Black Magic Probe (SWLINK), (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
#define BOARD_IDENT_DFU "Black Magic (Upgrade), STM8S Discovery, (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
#define BOARD_IDENT_UPD "Black Magic (DFU Upgrade), STM8S Discovery, (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
@@ -149,10 +141,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);
-
/* Use newlib provided integer only stdio functions */
#define sscanf siscanf
#define sprintf siprintf
diff --git a/src/platforms/tm4c/cdcacm.c b/src/platforms/tm4c/cdcacm.c
index 041d85b..2677ad5 100644
--- a/src/platforms/tm4c/cdcacm.c
+++ b/src/platforms/tm4c/cdcacm.c
@@ -35,7 +35,7 @@
#include <libopencm3/lm4f/usb.h>
#include <stdlib.h>
-#include "platform.h"
+#include "general.h"
#include "gdb_if.h"
#if defined(PLATFORM_HAS_TRACESWO)
#include <traceswo.h>
diff --git a/src/platforms/tm4c/gdb_if.c b/src/platforms/tm4c/gdb_if.c
index b14bbd3..7119638 100644
--- a/src/platforms/tm4c/gdb_if.c
+++ b/src/platforms/tm4c/gdb_if.c
@@ -22,10 +22,12 @@
* Serial Debugging protocol is implemented. This implementation for STM32
* uses the USB CDC-ACM device bulk endpoints to implement the channel.
*/
-#include "platform.h"
-#include <libopencm3/usb/usbd.h>
+#include "general.h"
#include "gdb_if.h"
+#include "cdcacm.h"
+
+#include <libopencm3/usb/usbd.h>
static volatile uint32_t head_out, tail_out;
static volatile uint32_t count_in;
diff --git a/src/platforms/tm4c/jtagtap.c b/src/platforms/tm4c/jtagtap.c
index f340b1e..e0bdd68 100644
--- a/src/platforms/tm4c/jtagtap.c
+++ b/src/platforms/tm4c/jtagtap.c
@@ -1,3 +1,4 @@
+#include "general.h"
#include "jtagtap.h"
int
diff --git a/src/platforms/tm4c/swdptap.c b/src/platforms/tm4c/swdptap.c
index 7004598..058f6ba 100644
--- a/src/platforms/tm4c/swdptap.c
+++ b/src/platforms/tm4c/swdptap.c
@@ -1,5 +1,4 @@
#include "general.h"
-#include "platform.h"
#include "swdptap.h"
static void swdptap_turnaround(uint8_t dir)
diff --git a/src/platforms/tm4c/traceswo.c b/src/platforms/tm4c/traceswo.c
index eb63139..03c6d66 100644
--- a/src/platforms/tm4c/traceswo.c
+++ b/src/platforms/tm4c/traceswo.c
@@ -32,14 +32,9 @@
#include <libopencm3/cm3/nvic.h>
#include <libopencm3/lm4f/rcc.h>
#include <libopencm3/lm4f/nvic.h>
-
#include <libopencm3/lm4f/uart.h>
-
#include <libopencm3/usb/usbd.h>
-#include <string.h>
-#include "platform.h"
-
void traceswo_init(void)
{
periph_clock_enable(RCC_GPIOD);
diff --git a/src/platforms/tm4c/usbuart.c b/src/platforms/tm4c/usbuart.c
index bb769f0..da82198 100644
--- a/src/platforms/tm4c/usbuart.c
+++ b/src/platforms/tm4c/usbuart.c
@@ -19,6 +19,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "general.h"
+#include "cdcacm.h"
#include <libopencm3/cm3/nvic.h>
#include <libopencm3/cm3/scs.h>
@@ -27,8 +29,6 @@
#include <libopencm3/lm4f/rcc.h>
#include <libopencm3/lm4f/uart.h>
-#include <platform.h>
-
#define FIFO_SIZE 128
/* RX Fifo buffer */