Changeset 58775d30 in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2003739

Parents:

6069061 (diff), 795e2bf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes

File:

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

kernel/arch/amd64/src/amd64.c

@@ -49 +49 @@
 #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>
@@ -168 +170 @@
 }
 
-void arch_post_cpu_init()
+void arch_post_cpu_init(void)
 {
 #ifdef CONFIG_SMP
@@ -212 +214 @@
         }
 #endif
+
+#if (defined(CONFIG_NS16550) || defined(CONFIG_NS16550_OUT))
+        /*
+         * Initialize the ns16550 controller.
+         */
+#ifdef CONFIG_NS16550_OUT
+        outdev_t *ns16550_out;
+        outdev_t **ns16550_out_ptr = &ns16550_out;
+#else
+        outdev_t **ns16550_out_ptr = NULL;
+#endif
+        ns16550_instance_t *ns16550_instance
+            = ns16550_init((ns16550_t *) NS16550_BASE, IRQ_NS16550, NULL, NULL,
+            ns16550_out_ptr);
+        if (ns16550_instance) {
+#ifdef CONFIG_NS16550
+                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);
+                        trap_virtual_enable_irqs(1 << IRQ_NS16550);
+                }
+#endif
+#ifdef CONFIG_NS16550_OUT
+                if (ns16550_out) {
+                        stdout_wire(ns16550_out);
+                }
+#endif
+        }
+#endif
         
         if (irqs_info != NULL)