Changes in kernel/arch/ia64/src/ia64.c [22f0561:d8db519] in mainline

File:

• kernel/arch/ia64/src/ia64.c (modified) (7 diffs)

kernel/arch/ia64/src/ia64.c

@@ -45 +45 @@
 #include <arch/drivers/it.h>
 #include <arch/drivers/kbd.h>
-#include <arch/legacyio.h>
 #include <genarch/drivers/ega/ega.h>
 #include <genarch/drivers/i8042/i8042.h>
@@ -52 +51 @@
 #include <genarch/kbrd/kbrd.h>
 #include <genarch/srln/srln.h>
-#include <mm/page.h>
-
-#ifdef MACHINE_ski
-#include <arch/drivers/ski.h>
-#endif
 
 /* NS16550 as a COM 1 */
@@ -64 +58 @@
 
 static uint64_t iosapic_base = 0xfec00000;
-uintptr_t legacyio_virt_base = 0;
 
 /** Performs ia64-specific initialization before main_bsp() is called. */
@@ -87 +80 @@
 static void iosapic_init(void)
 {
-        uintptr_t IOSAPIC = hw_map(iosapic_base, PAGE_SIZE);
+        uint64_t IOSAPIC = PA2KA((sysarg_t)(iosapic_base)) | FW_OFFSET;
         int i;
         
@@ -114 +107 @@
 {
         if (config.cpu_active == 1) {
-                /* Map the page with legacy I/O. */
-                legacyio_virt_base = hw_map(LEGACYIO_PHYS_BASE, LEGACYIO_SIZE);
-
                 iosapic_init();
                 irq_init(INR_COUNT, INR_COUNT);
@@ -123 +113 @@
 }
 
-void arch_post_cpu_init(void){
+void arch_post_cpu_init(void)
+{
 }
 
@@ -211 +202 @@
         sysinfo_set_item_val("ia64_iospace", NULL, true);
         sysinfo_set_item_val("ia64_iospace.address", NULL, true);
-        sysinfo_set_item_val("ia64_iospace.address.virtual", NULL, LEGACYIO_USER_BASE);
+        sysinfo_set_item_val("ia64_iospace.address.virtual", NULL, IO_OFFSET);
 }