Changeset 21b6307 in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2012-10-31T18:26:45Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3da166f0

Parents:

6bbe470

Message:

Merge ns16550_output into ns16550_init.

File:

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

kernel/arch/amd64/src/amd64.c

@@ -222 +222 @@
          * 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_init((ns16550_t *) NS16550_BASE, IRQ_NS16550, NULL, NULL,
+            ns16550_out_ptr);
         if (ns16550_instance) {
 #ifdef CONFIG_NS16550
@@ -235 +242 @@
 #endif
 #ifdef CONFIG_NS16550_OUT
-                outdev_t *ns16550_out = ns16550_output(ns16550_instance);
                 if (ns16550_out) {
                         stdout_wire(ns16550_out);