diff options
| -rw-r--r-- | arch/sandbox/config.mk | 1 | ||||
| -rw-r--r-- | arch/sandbox/cpu/cpu.c | 4 | ||||
| -rw-r--r-- | arch/sandbox/cpu/os.c | 27 | ||||
| -rw-r--r-- | board/sandbox/sandbox/sandbox.c | 4 | ||||
| -rw-r--r-- | include/os.h | 14 |
5 files changed, 47 insertions, 3 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..d7684d3 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -34,12 +34,12 @@ 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) { - return 0; + return os_get_nsec() / 1000; } int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index b7c3bf5..6d55b5c 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -23,9 +23,12 @@ #include <stdlib.h> #include <termios.h> #include <unistd.h> +#include <time.h> +#include <errno.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/mman.h> +#include <linux/types.h> #include <os.h> @@ -94,3 +97,27 @@ 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) +{ +#if defined(CLOCK_MONOTONIC) && defined(_POSIX_MONOTONIC_CLOCK) + struct timespec tp; + if (EINVAL == clock_gettime(CLOCK_MONOTONIC, &tp)) { + struct timeval tv; + + gettimeofday(&tv, NULL); + tp.tv_sec = tv.tv_sec; + tp.tv_nsec = tv.tv_usec * 1000; + } + return tp.tv_sec * 1000000000ULL + tp.tv_nsec; +#else + struct timeval tv; + gettimeofday(&tv, NULL); + return tv.tv_sec * 1000000000ULL + tv.tv_usec * 1000; +#endif +} 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); |