[U-Boot] [PATCH] sandbox: Add timer simulation

* [U-Boot] [PATCH] sandbox: Add timer simulation
@ 2011-11-28 21:40 Matthias Weisser
  2011-11-28 22:57 ` Mike Frysinger
  2011-11-29 11:16 ` [U-Boot] [PATCH V2] " Matthias Weisser
  0 siblings, 2 replies; 13+ messages in thread
From: Matthias Weisser @ 2011-11-28 21:40 UTC (permalink / raw)
  To: u-boot

Making sleep command work

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
---
 arch/sandbox/config.mk          |    1 +
 arch/sandbox/cpu/cpu.c          |    2 +-
 arch/sandbox/cpu/os.c           |   15 +++++++++++++++
 board/sandbox/sandbox/sandbox.c |    4 +++-
 include/os.h                    |   14 ++++++++++++++
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk
index ab33026..2ec1bb7 100644
--- a/arch/sandbox/config.mk
+++ b/arch/sandbox/config.mk
@@ -18,3 +18,4 @@
 # MA 02111-1307 USA
 
 PLATFORM_CPPFLAGS += -DCONFIG_SANDBOX -D__SANDBOX__
+PLATFORM_LIBS += -lrt
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index c7bf8a9..a15d3c2 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -34,7 +34,7 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 /* delay x useconds */
 void __udelay(unsigned long usec)
 {
-	/* Ignore this for now */
+	os_usleep(usec);
 }
 
 unsigned long timer_get_us(void)
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index b7c3bf5..d3357db 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
+#include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -94,3 +95,17 @@ void *os_malloc(size_t length)
 	return mmap(NULL, length, PROT_READ | PROT_WRITE,
 			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 }
+
+void os_usleep(unsigned long usec)
+{
+	usleep(usec);
+}
+
+u64 os_get_nsec(void)
+{
+	struct timespec tp;
+
+	clock_gettime(CLOCK_MONOTONIC, &tp);
+
+	return tp.tv_sec * 1000000000ULL + tp.tv_nsec;
+}
diff --git a/board/sandbox/sandbox/sandbox.c b/board/sandbox/sandbox/sandbox.c
index 95a5045..f376c74 100644
--- a/board/sandbox/sandbox/sandbox.c
+++ b/board/sandbox/sandbox/sandbox.c
@@ -21,6 +21,8 @@
 
 #include <common.h>
 
+#include <os.h>
+
 /*
  * Pointer to initial global data area
  *
@@ -34,7 +36,7 @@ void flush_cache(unsigned long start, unsigned long size)
 
 ulong get_timer(ulong base)
 {
-	return 0;
+	return (os_get_nsec() / 1000000) - base;
 }
 
 int timer_init(void)
diff --git a/include/os.h b/include/os.h
index fd4120c..f3af4f0 100644
--- a/include/os.h
+++ b/include/os.h
@@ -84,3 +84,17 @@ void os_tty_raw(int fd);
  * \return Pointer to length bytes or NULL on error
  */
 void *os_malloc(size_t length);
+
+/**
+ * Access to the usleep function of the os
+ *
+ * \param usec Time to sleep in micro seconds
+ */
+void os_usleep(unsigned long usec);
+
+/**
+ * Gets a monotonic increasing number of nano seconds from the OS
+ *
+ * \return A monotonic increasing time scaled in nano seconds
+ */
+u64 os_get_nsec(void);
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 13+ messages in thread