X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/6c506d8916fb114675e93d0e2cb20831d4022294..d1b1c8d9119229dbeed06cd252917e54a1cb77f6:/lunaix-os/arch/i386/arch.c

diff --git a/lunaix-os/arch/i386/arch.c b/lunaix-os/arch/i386/arch.c
index 3de802d..5ad6cd7 100644
--- a/lunaix-os/arch/i386/arch.c
+++ b/lunaix-os/arch/i386/arch.c
@@ -1,14 +1,12 @@
-#include <hal/apic_timer.h>
-#include <hal/rtc/mc146818a.h>
-
-#include <hal/hwrtc.h>
 #include <hal/hwtimer.h>
 
-#include <lunaix/isrm.h>
+#include <lunaix/generic/isrm.h>
 #include <lunaix/spike.h>
 
-#include <sys/i386_intr.h>
-#include <sys/interrupts.h>
+#include "sys/i386_intr.h"
+#include "sys/hart.h"
+
+#include "hal/apic_timer.h"
 
 void
 exception_init()
@@ -19,7 +17,7 @@ exception_init()
 }
 
 extern void
-syscall_hndlr(const isr_param* param);
+syscall_hndlr(const struct hart_state* hstate);
 
 void
 arch_preinit()
@@ -30,7 +28,7 @@ arch_preinit()
 }
 
 struct hwtimer*
-hwtimer_choose()
+select_platform_timer()
 {
     struct hwtimer* timer;