Changeset 3296df5 in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2012-10-28T21:34:06Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

24b06199

Parents:

b2ac3998

Message:

Add NS16550 serial input support on ia32 and amd64 platforms.

This is based on ia64 code for the same.
Currently the port used is hardcoded to be COM1.

File:

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

kernel/arch/amd64/src/amd64.c

@@ -50 +50 @@
 #include <genarch/drivers/ega/ega.h>
 #include <genarch/drivers/i8042/i8042.h>
+#include <genarch/drivers/ns16550/ns16550.h>
 #include <genarch/drivers/legacy/ia32/io.h>
 #include <genarch/fb/bfb.h>
 #include <genarch/kbrd/kbrd.h>
+#include <genarch/srln/srln.h>
 #include <genarch/multiboot/multiboot.h>
 #include <genarch/multiboot/multiboot2.h>
@@ -215 +217 @@
         }
 #endif
+
+#ifdef CONFIG_NS16550
+        /*
+         * Initialize the ns16550 controller. Then initialize the serial
+         * input module and connect it to ns16550.
+         */
+        ns16550_instance_t *ns16550_instance
+            = ns16550_init((ns16550_t *) NS16550_BASE, IRQ_NS16550, NULL, NULL);
+        if (ns16550_instance) {
+                srln_instance_t *srln_instance = srln_init();
+                if (srln_instance) {
+                        indev_t *sink = stdin_wire();
+                        indev_t *srln = srln_wire(srln_instance, sink);
+                        ns16550_wire(ns16550_instance, srln);
+                }
+        }
+#endif
         
         if (irqs_info != NULL)