aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/native/platform.c
diff options
context:
space:
mode:
authorGareth McMullin2013-12-04 16:16:08 +1300
committerGareth McMullin2013-12-04 16:16:08 +1300
commit8835df1822ed9e99ee593a6ed16bb44cf09e4c57 (patch)
tree50d6d84450ea055554f9809b7a4e05f3f8159c8b /src/platforms/native/platform.c
parent42570efaf8f76655fb6458f00dbfd20af0a73322 (diff)
parente3f3171a33f12064b876b98b537f2c6347761f42 (diff)
Merge remote-tracking branch 'origin/usbuart_highrate'
Diffstat (limited to 'src/platforms/native/platform.c')
-rw-r--r--src/platforms/native/platform.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/platforms/native/platform.c b/src/platforms/native/platform.c
index 640ba58..214625e 100644
--- a/src/platforms/native/platform.c
+++ b/src/platforms/native/platform.c
@@ -126,8 +126,6 @@ int platform_init(void)
systick_interrupt_enable();
systick_counter_enable();
- usbuart_init();
-
if (platform_hwversion() > 0) {
adc_init();
} else {
@@ -139,6 +137,7 @@ int platform_init(void)
SCB_VTOR = 0x2000; // Relocate interrupt vector table here
cdcacm_init();
+ usbuart_init();
jtag_scan(NULL);