aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/launchpad-icdi
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/launchpad-icdi
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/launchpad-icdi')
-rw-r--r--src/platforms/launchpad-icdi/platform.c11
-rw-r--r--src/platforms/launchpad-icdi/platform.h16
2 files changed, 5 insertions, 22 deletions
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()