Changes in kernel/arch/amd64/src/amd64.c [21b6307:4a5ba372] in mainline

File:

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

kernel/arch/amd64/src/amd64.c

@@ -43 +43 @@
 #include <arch/bios/bios.h>
 #include <arch/boot/boot.h>
-#include <arch/debugger.h>
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>
@@ -50 +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>
@@ -163 +160 @@
 #endif
                 
-                /* Enable debugger */
-                debugger_init();
                 /* Merge all memory zones to 1 big zone */
                 zone_merge_all();
@@ -217 +212 @@
         }
 #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)