Changeset c01bb5f9 in mainline for kernel/arch

Timestamp:

2012-02-16T21:21:39Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

39aa8ce, 856a36bb, f943dd3

Parents:

edd7c63c (diff), 21063c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/mm.

Location:

kernel/arch

Files:

• arm32/src/mach/integratorcp/integratorcp.c (modified) (1 diff)
• arm32/src/mach/testarm/testarm.c (modified) (1 diff)
• ia64/src/ia64.c (modified) (1 diff)
• mips32/src/mips32.c (modified) (1 diff)
• ppc32/src/ppc32.c (modified) (1 diff)
• sparc64/src/drivers/kbd.c (modified) (1 diff)

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -332 +332 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, ICP_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.status", NULL,
-            (uintptr_t) icp_hw_map.kbd_stat);
-        sysinfo_set_item_val("kbd.address.data", NULL,
-            (uintptr_t) icp_hw_map.kbd_data);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            ICP_KBD);
 
 }

kernel/arch/arm32/src/mach/testarm/testarm.c

@@ -128 +128 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.virtual", NULL, (sysarg_t) gxemul_kbd);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            GXEMUL_KBD_ADDRESS);
 #endif
 }

kernel/arch/ia64/src/ia64.c

@@ -188 +188 @@
         sysinfo_set_item_val("kbd.address.physical", NULL,
             (uintptr_t) NS16550_BASE);
-        sysinfo_set_item_val("kbd.address.kernel", NULL,
-            (uintptr_t) NS16550_BASE);
 #endif
         

kernel/arch/mips32/src/mips32.c

@@ -196 +196 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.virtual", NULL, MSIM_KBD_ADDRESS);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            PA2KA(MSIM_KBD_ADDRESS));
 #endif
 }

kernel/arch/ppc32/src/ppc32.c

@@ -232 +232 @@
                 sysinfo_set_item_val("cuda.inr", NULL, IRQ_CUDA);
                 sysinfo_set_item_val("cuda.address.physical", NULL, pa);
-                sysinfo_set_item_val("cuda.address.kernel", NULL,
-                    (uintptr_t) cuda);
 #endif
         }

kernel/arch/sparc64/src/drivers/kbd.c

@@ -133 +133 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, inr);
-        sysinfo_set_item_val("kbd.address.kernel", NULL,
-            (uintptr_t) ns16550);
         sysinfo_set_item_val("kbd.address.physical", NULL, pa);
         sysinfo_set_item_val("kbd.type.ns16550", NULL, true);