Changeset ff685c9 in mainline for kernel/arch

Timestamp:

2009-03-03T23:00:33Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

150385b9

Parents:

9cd98796

Message:

Make the kbd port drivers platform neutral by using PIO functions.
The kernel now supplies the physical address and the kernel virtual address.

Location:

kernel/arch

Files:

• amd64/src/amd64.c (modified) (1 diff)
• ia32/src/ia32.c (modified) (1 diff)
• ia64/src/ia64.c (modified) (1 diff)
• sparc64/src/drivers/kbd.c (modified) (2 diffs)

kernel/arch/amd64/src/amd64.c

@@ -200 +200 @@
         sysinfo_set_item_val("kbd.devno", NULL, devno);
         sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            (uintptr_t) I8042_BASE);
+        sysinfo_set_item_val("kbd.address.kernel", NULL,
+            (uintptr_t) I8042_BASE);
 }
 

kernel/arch/ia32/src/ia32.c

@@ -158 +158 @@
         sysinfo_set_item_val("kbd.devno", NULL, devno);
         sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            (uintptr_t) I8042_BASE);
+        sysinfo_set_item_val("kbd.address.kernel", NULL,
+            (uintptr_t) I8042_BASE);
 }
 

kernel/arch/ia64/src/ia64.c

@@ -169 +169 @@
         (void) ns16550_init((ns16550_t *)NS16550_BASE, devno, inr, NULL, NULL);
         sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
-        sysinfo_set_item_val("kbd.port", NULL, (uintptr_t)NS16550_BASE);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            (uintptr_t) NS16550_BASE);
+        sysinfo_set_item_val("kbd.address.kernel", NULL,
+            (uintptr_t) NS16550_BASE);
 #else
         inr = IRQ_KBD;
         (void) i8042_init((i8042_t *)I8042_BASE, devno, inr);
         sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            (uintptr_t) I8042_BASE);
+        sysinfo_set_item_val("kbd.address.kernel", NULL,
+            (uintptr_t) I8042_BASE);
 #endif
         sysinfo_set_item_val("kbd", NULL, true);

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

@@ -170 +170 @@
                 sysinfo_set_item_val("kbd.devno", NULL, devno);
                 sysinfo_set_item_val("kbd.inr", NULL, inr);
-                sysinfo_set_item_val("kbd.address.virtual", NULL,
+                sysinfo_set_item_val("kbd.address.kernel", NULL,
                     (uintptr_t) z8530);
                 sysinfo_set_item_val("kbd.address.physical", NULL, pa);
@@ -190 +190 @@
                 sysinfo_set_item_val("kbd.devno", NULL, devno);
                 sysinfo_set_item_val("kbd.inr", NULL, inr);
-                sysinfo_set_item_val("kbd.address.virtual", NULL,
+                sysinfo_set_item_val("kbd.address.kernel", NULL,
                     (uintptr_t) ns16550);
                 sysinfo_set_item_val("kbd.address.physical", NULL, pa);