From 2691b6088bddb12c4a17d08628e0af0a96b59b7f Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Sun, 27 Aug 2017 16:07:29 +0200
Subject: kern/clock: new module

---
 arch/x86/machine/lapic.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'arch/x86/machine/lapic.c')

diff --git a/arch/x86/machine/lapic.c b/arch/x86/machine/lapic.c
index a0eee85..1a81a18 100644
--- a/arch/x86/machine/lapic.c
+++ b/arch/x86/machine/lapic.c
@@ -20,11 +20,11 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <kern/clock.h>
 #include <kern/init.h>
 #include <kern/log.h>
 #include <kern/macros.h>
 #include <kern/panic.h>
-#include <kern/thread.h>
 #include <machine/cpu.h>
 #include <machine/lapic.h>
 #include <machine/pmap.h>
@@ -211,7 +211,7 @@ lapic_compute_freq(void)
     lapic_bus_freq = (c1 - c2) * (1000000 / LAPIC_TIMER_CAL_DELAY);
     log_info("lapic: bus frequency: %u.%02u MHz", lapic_bus_freq / 1000000,
              lapic_bus_freq % 1000000);
-    lapic_write(&lapic_map->timer_icr, lapic_bus_freq / THREAD_TICK_FREQ);
+    lapic_write(&lapic_map->timer_icr, lapic_bus_freq / CLOCK_FREQ);
     lapic_write(&lapic_map->svr, 0);
 }
 
@@ -238,7 +238,7 @@ lapic_setup_registers(void)
     lapic_write(&lapic_map->lvt_lint1, LAPIC_LVT_MASK_INTR);
     lapic_write(&lapic_map->lvt_error, TRAP_LAPIC_ERROR);
     lapic_write(&lapic_map->timer_dcr, LAPIC_TIMER_DCR_DIV1);
-    lapic_write(&lapic_map->timer_icr, lapic_bus_freq / THREAD_TICK_FREQ);
+    lapic_write(&lapic_map->timer_icr, lapic_bus_freq / CLOCK_FREQ);
 }
 
 void __init
@@ -333,7 +333,7 @@ lapic_timer_intr(struct trap_frame *frame)
     (void)frame;
 
     lapic_eoi();
-    thread_tick_intr();
+    clock_tick_intr();
 }
 
 void
-- 
cgit v1.2.3