Implement shift+<key> support, and ...

[lunaix-os.git] / lunaix-os / includes / hal / apic.h

diff --git a/lunaix-os/includes/hal/apic.h b/lunaix-os/includes/hal/apic.h
index 851e75eab2916051ba486a5e4faf190e90fe646a..42a211e0f5638a11f0d3363ebcfa494fca2a4d37 100644 (file)
--- a/lunaix-os/includes/hal/apic.h
+++ b/lunaix-os/includes/hal/apic.h
@@ -6,7 +6,7 @@
 #define APIC_BASE_VADDR 0x1000
 #define __APIC_BASE_PADDR 0xFEE00000
 
 #define APIC_BASE_VADDR 0x1000
 #define __APIC_BASE_PADDR 0xFEE00000
 

-#define IA32_APIC_BASE_MSR 0x1B
+#define IA32_MSR_APIC_BASE 0x1B

 #define IA32_APIC_ENABLE   0x800
 
 /*
 #define IA32_APIC_ENABLE   0x800
 
 /*


@@ -67,7 +67,7 @@
 #define apic_write_reg(reg, val)     (*(uint32_t*)(APIC_BASE_VADDR + (reg)) = (val))
 
 void
 #define apic_write_reg(reg, val)     (*(uint32_t*)(APIC_BASE_VADDR + (reg)) = (val))
 
 void

-init_apic();
+apic_init();

 
 /**
  * @brief Tell the APIC that the handler for current interrupt is finished.
 
 /**
  * @brief Tell the APIC that the handler for current interrupt is finished.