Merge branch 'net-dev'. See body of commit for details.
[akaros.git] / kern / arch / i386 / apic.h
index 8a03c7c..615950f 100644 (file)
@@ -14,6 +14,7 @@
 
 #include <arch/mmu.h>
 #include <arch/x86.h>
+#include <arch/ioapic.h>
 
 // PIC
 #define PIC1_CMD                                       0x20
@@ -51,9 +52,6 @@
 #define LAPIC_IPI_ICR_LOWER                    (LAPIC_BASE + 0x300)
 #define LAPIC_IPI_ICR_UPPER                    (LAPIC_BASE + 0x310)
 
-// IOAPIC
-#define IOAPIC_BASE                                    0xfec00000 // this is the default, can be changed
-
 // PIT (Programmable Interval Timer)
 #define        TIMER_REG_CNTR0 0       /* timer 0 counter port */
 #define        TIMER_REG_CNTR1 1       /* timer 1 counter port */