Changes in kernel/arch/ia64/src/ia64.c [88dfee7:adec5b45] in mainline

File:

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

kernel/arch/ia64/src/ia64.c

@@ -53 +53 @@
 #include <genarch/srln/srln.h>
 #include <mm/page.h>
+#include <mm/km.h>
 
 #ifdef MACHINE_ski
@@ -69 +70 @@
 void arch_pre_main(void)
 {
-        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
+        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS,
+            CONFIG_INIT_TASKS);
         size_t i;
+
         for (i = 0; i < init.cnt; i++) {
-                init.tasks[i].addr =
-                    ((unsigned long) bootinfo->taskmap.tasks[i].addr) |
-                    VRN_MASK;
+                init.tasks[i].paddr =
+                    (uintptr_t) bootinfo->taskmap.tasks[i].addr;
                 init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
@@ -87 +89 @@
 static void iosapic_init(void)
 {
-        uintptr_t IOSAPIC = hw_map(iosapic_base, PAGE_SIZE);
+        uintptr_t IOSAPIC = km_map(iosapic_base, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         int i;
         
@@ -115 +118 @@
         if (config.cpu_active == 1) {
                 /* Map the page with legacy I/O. */
-                legacyio_virt_base = hw_map(LEGACYIO_PHYS_BASE, LEGACYIO_SIZE);
+                legacyio_virt_base = km_map(LEGACYIO_PHYS_BASE, LEGACYIO_SIZE,
+                    PAGE_WRITE | PAGE_NOT_CACHEABLE);
 
                 iosapic_init();
@@ -188 +192 @@
         
 #ifdef CONFIG_I8042
-        i8042_instance_t *i8042_instance = i8042_init((i8042_t *) I8042_BASE,
-            IRQ_KBD);
+        i8042_instance_t *i8042_instance = i8042_init((i8042_t *) I8042_BASE, IRQ_KBD);
         if (i8042_instance) {
                 kbrd_instance_t *kbrd_instance = kbrd_init();
@@ -198 +201 @@
                 }
         }
-#endif
-        
+        
+        sysinfo_set_item_val("i8042", NULL, true);
+        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
+        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
+        sysinfo_set_item_val("i8042.address.physical", NULL,
+            (uintptr_t) I8042_BASE);
+        sysinfo_set_item_val("i8042.address.kernel", NULL,
+            (uintptr_t) I8042_BASE);
+#endif
+
+        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
+
         sysinfo_set_item_val("ia64_iospace", NULL, true);
         sysinfo_set_item_val("ia64_iospace.address", NULL, true);