aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/launchpad-icdi/platform.c
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/platform.c
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/platform.c')
-rw-r--r--src/platforms/launchpad-icdi/platform.c11
1 files changed, 4 insertions, 7 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)