Changeset 6bbe470 in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2012-10-29T22:56:18Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

21b6307

Parents:

5030acad

Message:

Implement output in ns16550 driver.

File:

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

kernel/arch/amd64/src/amd64.c

@@ -55 +55 @@
 #include <genarch/kbrd/kbrd.h>
 #include <genarch/srln/srln.h>
-#include <genarch/drivers/dsrln/dsrlnout.h>
 #include <genarch/multiboot/multiboot.h>
 #include <genarch/multiboot/multiboot2.h>
@@ -219 +218 @@
 #endif
 
-#ifdef CONFIG_NS16550
+#if (defined(CONFIG_NS16550) || defined(CONFIG_NS16550_OUT))
         /*
-         * Initialize the ns16550 controller. Then initialize the serial
-         * input module and connect it to ns16550.
+         * Initialize the ns16550 controller.
          */
         ns16550_instance_t *ns16550_instance
             = ns16550_init((ns16550_t *) NS16550_BASE, IRQ_NS16550, NULL, NULL);
         if (ns16550_instance) {
+#ifdef CONFIG_NS16550
                 srln_instance_t *srln_instance = srln_init();
                 if (srln_instance) {
@@ -234 +233 @@
                         trap_virtual_enable_irqs(1 << IRQ_NS16550);
                 }
-        }
-#endif
-
-#ifdef CONFIG_NS16550_DSRLNOUT
-        /*
-         * Initialize dummy serial output to the ns16550.
-         */
-        outdev_t *dsrlndev = dsrlnout_init(NS16550_BASE);
-        if (dsrlndev) {
-                stdout_wire(dsrlndev);
+#endif
+#ifdef CONFIG_NS16550_OUT
+                outdev_t *ns16550_out = ns16550_output(ns16550_instance);
+                if (ns16550_out) {
+                        stdout_wire(ns16550_out);
+                }
+#endif
         }
 #endif