Changeset 4c7257b in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2009-02-28T18:55:38Z (16 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.

File:

• kernel/arch/ia64/src/ia64.c (modified) (1 diff)

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