aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth McMullin2015-03-02 23:27:42 -0800
committerGareth McMullin2015-03-22 12:26:45 -0700
commit9a8dbdeff7b9bac70719ddb51a6f83a1266a2d44 (patch)
tree550ce062fe4ca0dccffb105f8ed5341d0f32dd37
parent83b83ca48f71639d14673d1deb544bf39a7332be (diff)
Fix errors when building for non-native platforms.
-rw-r--r--src/platforms/f4discovery/platform.h1
-rw-r--r--src/platforms/launchpad-icdi/platform.c14
-rw-r--r--src/platforms/launchpad-icdi/platform.h2
-rw-r--r--src/platforms/libftdi/platform.c19
-rw-r--r--src/platforms/stlink/platform.h1
-rw-r--r--src/platforms/swlink/platform.h1
6 files changed, 36 insertions, 2 deletions
diff --git a/src/platforms/f4discovery/platform.h b/src/platforms/f4discovery/platform.h
index 3c5c582..68027ee 100644
--- a/src/platforms/f4discovery/platform.h
+++ b/src/platforms/f4discovery/platform.h
@@ -28,6 +28,7 @@
#include "gpio.h"
#include "morse.h"
#include "timing.h"
+#include "target.h"
#include <setjmp.h>
diff --git a/src/platforms/launchpad-icdi/platform.c b/src/platforms/launchpad-icdi/platform.c
index e689f0c..1a3598a 100644
--- a/src/platforms/launchpad-icdi/platform.c
+++ b/src/platforms/launchpad-icdi/platform.c
@@ -86,10 +86,20 @@ platform_init(void)
cdcacm_init();
}
+void platform_timeout_set(uint32_t ms)
+{
+ timeout_counter = ms / 10;
+}
+
+bool platform_timeout_is_expired(void)
+{
+ return timeout_counter == 0;
+}
+
void platform_delay(uint32_t delay)
{
- timeout_counter = delay * 10;
- while(timeout_counter);
+ platform_timeout_set(delay);
+ while (platform_timeout_is_expired());
}
const char *platform_target_voltage(void)
diff --git a/src/platforms/launchpad-icdi/platform.h b/src/platforms/launchpad-icdi/platform.h
index eb3ac6e..ddc2035 100644
--- a/src/platforms/launchpad-icdi/platform.h
+++ b/src/platforms/launchpad-icdi/platform.h
@@ -18,6 +18,8 @@
#define __PLATFORM_H
#include "gdb_packet.h"
+#include "target.h"
+#include "morse.h"
#include <setjmp.h>
diff --git a/src/platforms/libftdi/platform.c b/src/platforms/libftdi/platform.c
index 634090d..3062698 100644
--- a/src/platforms/libftdi/platform.c
+++ b/src/platforms/libftdi/platform.c
@@ -21,6 +21,7 @@
#include "gdb_if.h"
#include <assert.h>
+#include <sys/time.h>
struct ftdi_context *ftdic;
@@ -258,3 +259,21 @@ void platform_delay(uint32_t delay)
usleep(delay * 100000);
}
+static uint32_t timeout_time;
+static uint32_t time_ms(void)
+{
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ return (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
+}
+
+void platform_timeout_set(uint32_t ms)
+{
+ timeout_time = time_ms() + ms;
+}
+
+bool platform_timeout_is_expired(void)
+{
+ return time_ms() > timeout_time;
+}
+
diff --git a/src/platforms/stlink/platform.h b/src/platforms/stlink/platform.h
index f026db3..549b6d6 100644
--- a/src/platforms/stlink/platform.h
+++ b/src/platforms/stlink/platform.h
@@ -27,6 +27,7 @@
#include "gdb_packet.h"
#include "gpio.h"
#include "timing.h"
+#include "target.h"
#include <libopencm3/cm3/common.h>
#include <libopencm3/stm32/f1/memorymap.h>
diff --git a/src/platforms/swlink/platform.h b/src/platforms/swlink/platform.h
index 27cc299..e82124a 100644
--- a/src/platforms/swlink/platform.h
+++ b/src/platforms/swlink/platform.h
@@ -27,6 +27,7 @@
#include "gdb_packet.h"
#include "gpio.h"
#include "timing.h"
+#include "target.h"
#include <setjmp.h>