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

Timestamp:

2009-03-07T16:51:51Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3014e2b

Parents:

411b6a6

Message:

Serial line module.

File:

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

kernel/arch/ia64/src/ia64.c

@@ -56 +56 @@
 #include <genarch/drivers/ega/ega.h>
 #include <genarch/kbrd/kbrd.h>
+#include <genarch/srln/srln.h>
 #include <genarch/drivers/i8042/i8042.h>
-#include <genarch/kbd/ns16550.h>
+#include <genarch/drivers/ns16550/ns16550.h>
+#include <arch/drivers/kbd.h>
 #include <smp/smp.h>
 #include <smp/ipi.h>
@@ -171 +173 @@
 #ifdef CONFIG_NS16550
         inr = NS16550_IRQ;
-        (void) ns16550_init((ns16550_t *)NS16550_BASE, devno, inr, NULL, NULL);
+        srln_init(stdin);
+        (void) ns16550_init((ns16550_t *)NS16550_BASE, devno, inr, NULL, NULL,
+            &srlnin);
         sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
         sysinfo_set_item_val("kbd.address.physical", NULL,