summaryrefslogtreecommitdiff
path: root/kernel/x86.c
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-11-17 21:21:07 +0100
committerMichal Idziorek <m.i@gmx.at>2014-11-17 21:21:07 +0100
commit3d1f0b2cc16ba6a5bb1d47e24f4bb9e33a7e1aaf (patch)
tree4e9f4e18563985c20b3406fe0f4241bf90674a2b /kernel/x86.c
parent3e151cb6371ecba06e21c3e56e0a95c8af4e93f9 (diff)
minor fixes and testing
Diffstat (limited to 'kernel/x86.c')
-rw-r--r--kernel/x86.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/x86.c b/kernel/x86.c
index 15236a3..725c50d 100644
--- a/kernel/x86.c
+++ b/kernel/x86.c
@@ -1,6 +1,7 @@
#define FOOLOS_MODULE_NAME "x86"
#include "x86.h"
+#include "timer.h"
#include "lib/int/stdint.h"
#include "lib/logger/log.h"
@@ -8,11 +9,9 @@
// suffix (b, w, l, q for byte, word, dword, and qword).
//
-extern volatile uint64_t task_system_clock; // from task.c
-
void sleep(int i)
{
- volatile uint64_t clock=task_system_clock;
+ volatile uint64_t clock=timer_get_ticks();
// while(clock+i>task_system_clock)
// {