diff options
| author | Franklin Wei <frankhwei536@gmail.com> | 2015-02-08 12:15:06 -0500 |
|---|---|---|
| committer | Franklin Wei <frankhwei536@gmail.com> | 2015-02-08 12:15:06 -0500 |
| commit | 0d7cde7c4d735ebebd39b988440f50f5889bd29f (patch) | |
| tree | 7ddc66bfc3c64becdb55af3bb6e33a536421b1a6 /kernel/timer.c | |
| parent | ea15c8963fa17deaba4356219e481128db66f5bc (diff) | |
| download | kappa-0d7cde7c4d735ebebd39b988440f50f5889bd29f.zip kappa-0d7cde7c4d735ebebd39b988440f50f5889bd29f.tar.gz kappa-0d7cde7c4d735ebebd39b988440f50f5889bd29f.tar.bz2 kappa-0d7cde7c4d735ebebd39b988440f50f5889bd29f.tar.xz | |
lots of stuff
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 2fbd8eb..7bdc1f9 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -32,5 +32,6 @@ void timer_init(uint32_t freq) void timer_delay(uint64_t ticks) { uint64_t end = *current_tick + ticks; - while(*current_tick <= end); + while(*current_tick <= end) + asm("hlt"); } |