Decoupling Architectural-specific Code (#35)

[lunaix-os.git] / lunaix-os / arch / i386 / hal / ioapic.c

diff --git a/lunaix-os/arch/i386/hal/ioapic.c b/lunaix-os/arch/i386/hal/ioapic.c
index 7e7800d9c538ee9c7c2b194adaa6ec25971decaf..83ce6a09a2a476588cfe321d2a7f9a0b1654cb02 100644 (file)
--- a/lunaix-os/arch/i386/hal/ioapic.c
+++ b/lunaix-os/arch/i386/hal/ioapic.c
@@ -1,10 +1,10 @@
 #include <hal/acpi/acpi.h>
 #include <hal/acpi/acpi.h>

-#include <hal/intc.h>

 
 #include <lunaix/mm/mmio.h>
 
 
 #include <lunaix/mm/mmio.h>
 

-#include <sys/interrupts.h>
-#include <sys/ioapic.h>
+#include <sys/hart.h>
+#include "sys/ioapic.h"
+#include "sys/x86_isa.h"

 
 #define IOAPIC_IOREGSEL 0x00
 #define IOAPIC_IOWIN 0x10
 
 #define IOAPIC_IOREGSEL 0x00
 #define IOAPIC_IOWIN 0x10


@@ -56,7 +56,7 @@ ioapic_read(u8_t sel)
 }
 
 void
 }
 
 void

-ioapic_irq_remap(struct intc_context*, int irq, int iv, cpu_t dest, u32_t flags)
+ioapic_irq_remap(struct x86_intc* intc, int irq, int iv, cpu_t dest, u32_t flags)

 {
     /*
         FIXME move it to HAL level. since every platform might have their own
 {
     /*
         FIXME move it to HAL level. since every platform might have their own