Changeset 4c7257b in mainline for kernel/arch

Timestamp:

2009-02-28T18:55:38Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bc18d63

Parents:

c43b1db2

Message:

Do not set sysinfo for uspace drivers directly in the kernel drivers.

Location:

kernel/arch

Files:

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

kernel/arch/amd64/src/amd64.c

@@ -64 +64 @@
 #include <ddi/irq.h>
 #include <ddi/device.h>
+#include <sysinfo/sysinfo.h>
 
 
@@ -174 +175 @@
 void arch_post_smp_init(void)
 {
+        devno_t devno = device_assign_devno();
         /* keyboard controller */
-        (void) i8042_init((i8042_t *) I8042_BASE, device_assign_devno(),
-            IRQ_KBD);
+        (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD);
+
+        /*
+         * This is the necessary evil until the userspace driver is entirely
+         * self-sufficient.
+         */
+        sysinfo_set_item_val("kbd", NULL, true);
+        sysinfo_set_item_val("kbd.devno", NULL, devno);
+        sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
 }
 

kernel/arch/ia32/src/ia32.c

@@ -63 +63 @@
 #include <console/console.h>
 #include <ddi/device.h>
+#include <sysinfo/sysinfo.h>
 
 #ifdef CONFIG_SMP
@@ -125 +126 @@
 void arch_post_smp_init(void)
 {
-        devno_t kbd = device_assign_devno();
+        devno_t devno = device_assign_devno();
         /* keyboard controller */
-        (void) i8042_init((i8042_t *) I8042_BASE, kbd, IRQ_KBD);
+        (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD);
+
+        /*
+         * This is the necessary evil until the userspace driver is entirely
+         * self-sufficient.
+         */
+        sysinfo_set_item_val("kbd", NULL, true);
+        sysinfo_set_item_val("kbd.devno", NULL, devno);
+        sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
 }
 

kernel/arch/ia64/src/ia64.c

@@ -161 +161 @@
 
 #ifdef I460GX
-        devno_t kbd = device_assign_devno();
+        devno_t devno = device_assign_devno();
+        inr_t inr;
 
 #ifdef CONFIG_NS16550
-        (void) ns16550_init((ns16550_t *)NS16550_BASE, kbd, NS16550_IRQ, NULL,
-             NULL);
+        inr = NS16550_IRQ;
+        (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);
 #else
-        (void) i8042_init((i8042_t *)I8042_BASE, kbd, IRQ_KBD);
-#endif
+        inr = IRQ_KBD;
+        (void) i8042_init((i8042_t *)I8042_BASE, devno, inr);
+        sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
+#endif
+        sysinfo_set_item_val("kbd", NULL, true);
+        sysinfo_set_item_val("kbd.devno", NULL, devno);
+        sysinfo_set_item_val("kbd.inr", NULL, inr);
 #endif
 

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

@@ -67 +67 @@
         cir_t cir;
         void *cir_arg;
+
+#ifdef CONFIG_NS16550
+        ns16550_t *ns16550;
+#endif
+#ifdef CONFIG_Z8530
+        z8530_t *z8530;
+#endif
         
         name = ofw_tree_node_name(node);
@@ -101 +108 @@
         uintptr_t pa;
         size_t size;
+        devno_t devno;
         inr_t inr;
         
@@ -149 +157 @@
 #ifdef CONFIG_Z8530
         case KBD_Z8530:
-                (void) z8530_init((z8530_t *) hw_map(aligned_addr,
-                    offset + size) + offset, device_assign_devno(), inr, cir,
-                    cir_arg);
+                devno = device_assign_devno();
+                z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) +
+                    offset;
+                (void) z8530_init(z8530, devno, inr, cir, cir_arg);
+                
+                /*
+                 * This is the necessary evil until the userspace drivers are
+                 * entirely self-sufficient.
+                 */
+                sysinfo_set_item_val("kbd", NULL, true);
+                sysinfo_set_item_val("kbd.type", NULL, KBD_Z8530);
+                sysinfo_set_item_val("kbd.devno", NULL, devno);
+                sysinfo_set_item_val("kbd.inr", NULL, inr);
+                sysinfo_set_item_val("kbd.address.virtual", NULL,
+                    (uintptr_t) z8530);
+                sysinfo_set_item_val("kbd.address.physical", NULL, pa);
                 break;
 #endif
 #ifdef CONFIG_NS16550
         case KBD_NS16550:
-                (void) ns16550_init((ns16550_t *) (hw_map(aligned_addr,
-                    offset + size) + offset), device_assign_devno(), inr, cir,
-                    cir_arg);
+                devno = device_assign_devno();
+                ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) +
+                    offset;
+                (void) ns16550_init(ns16550, devno, inr, cir, cir_arg);
+                
+                /*
+                 * This is the necessary evil until the userspace driver is
+                 * entirely self-sufficient.
+                 */
+                sysinfo_set_item_val("kbd", NULL, true);
+                sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
+                sysinfo_set_item_val("kbd.devno", NULL, devno);
+                sysinfo_set_item_val("kbd.inr", NULL, inr);
+                sysinfo_set_item_val("kbd.address.virtual", NULL,
+                    (uintptr_t) ns16550);
+                sysinfo_set_item_val("kbd.address.physical", NULL, pa);
                 break;
 #endif