refactor: decouple i386 specific instruction invocation

[lunaix-os.git] / lunaix-os / hal / apic.c

diff --git a/lunaix-os/hal/apic.c b/lunaix-os/hal/apic.c
index 00995252120892cde34712677f641795ea390634..29794eb11d74e715ecd663506d2d10fb77c8c422 100644 (file)
--- a/lunaix-os/hal/apic.c
+++ b/lunaix-os/hal/apic.c
@@ -13,7 +13,7 @@
 #include <hal/pic.h>
 #include <hal/rtc.h>
 
 #include <hal/pic.h>
 #include <hal/rtc.h>
 

-#include <arch/x86/interrupts.h>
+#include <arch/i386/interrupts.h>

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


@@ -34,12 +34,14 @@ apic_init()
 
     // Make sure the APIC is there
     //  FUTURE: Use 8259 as fallback
 
     // Make sure the APIC is there
     //  FUTURE: Use 8259 as fallback

-    assert_msg(cpu_has_apic(), "No APIC detected!");
+
+    // FIXME apic abstraction as local interrupt controller
+    // assert_msg(cpu_has_apic(), "No APIC detected!");

 
     // As we are going to use APIC, disable the old 8259 PIC
     pic_disable();
 
 
     // As we are going to use APIC, disable the old 8259 PIC
     pic_disable();
 

-    _apic_base = ioremap(__APIC_BASE_PADDR, 4096);
+    _apic_base = (ptr_t)ioremap(__APIC_BASE_PADDR, 4096);

 
     // Hardware enable the APIC
     // By setting bit 11 of IA32_APIC_BASE register
 
     // Hardware enable the APIC
     // By setting bit 11 of IA32_APIC_BASE register


@@ -53,8 +55,8 @@ apic_init()
                  : "eax", "ecx", "edx");
 
     // Print the basic information of our current local APIC
                  : "eax", "ecx", "edx");
 
     // Print the basic information of our current local APIC

-    uint32_t apic_id = apic_read_reg(APIC_IDR) >> 24;
-    uint32_t apic_ver = apic_read_reg(APIC_VER);
+    u32_t apic_id = apic_read_reg(APIC_IDR) >> 24;
+    u32_t apic_ver = apic_read_reg(APIC_VER);

 
     kprintf(KINFO "ID: %x, Version: %x, Max LVT: %u\n",
             apic_id,
 
     kprintf(KINFO "ID: %x, Version: %x, Max LVT: %u\n",
             apic_id,


@@ -74,7 +76,7 @@ apic_init()
     apic_write_reg(APIC_TPR, APIC_PRIORITY(2, 0));
 
     // enable APIC
     apic_write_reg(APIC_TPR, APIC_PRIORITY(2, 0));
 
     // enable APIC

-    uint32_t spiv = apic_read_reg(APIC_SPIVR);
+    u32_t spiv = apic_read_reg(APIC_SPIVR);

 
     // install our handler for spurious interrupt.
     spiv = (spiv & ~0xff) | APIC_SPIV_APIC_ENABLE | APIC_SPIV_IV;
 
     // install our handler for spurious interrupt.
     spiv = (spiv & ~0xff) | APIC_SPIV_APIC_ENABLE | APIC_SPIV_IV;