Merge remote-tracking branch 'origin/master' into isa/arm64

[lunaix-os.git] / lunaix-os / arch / x86 / arch.c

diff --git a/lunaix-os/arch/x86/arch.c b/lunaix-os/arch/x86/arch.c
index 988f97654a4a25cc9beda371425b463da175898e..e98bdd9de7b3eca8b06085598b126d7c3f273270 100644 (file)
--- a/lunaix-os/arch/x86/arch.c
+++ b/lunaix-os/arch/x86/arch.c
@@ -1,12 +1,12 @@
 #include <hal/hwtimer.h>
 
-#include <lunaix/generic/isrm.h>
 #include <lunaix/spike.h>
 #include <lunaix/process.h>
 
-#include "sys/int_handler.h"
-#include "sys/x86_isa.h"
-#include "sys/hart.h"
+#include <asm/x86_isrm.h>
+
+#include "asm/x86.h"
+#include "asm/hart.h"
 
 #include "hal/apic_timer.h"
 
@@ -29,21 +29,6 @@ arch_preinit()
     isrm_bindiv(LUNAIX_SYS_CALL, syscall_hndlr);
 }
 
-struct hwtimer*
-select_platform_timer()
-{
-    struct hwtimer* timer;
-
-    timer = apic_hwtimer_context();
-    if (timer->supported(timer)) {
-        return timer;
-    }
-
-    // TODO select alternatives...
-
-    panick("no timer to use.");
-}
-
 void
 update_tss()
 {