Changes in kernel/arch/mips32/src/mach/malta/malta.c [2a103b5:c5429fe] in mainline

File:

• kernel/arch/mips32/src/mach/malta/malta.c (modified) (3 diffs)

kernel/arch/mips32/src/mach/malta/malta.c

@@ -38 +38 @@
 #include <console/chardev.h>
 #include <arch/mm/page.h>
-#include <genarch/drivers/i8259/i8259.h>
-#include <genarch/drivers/ns16550/ns16550.h>
-#include <genarch/srln/srln.h>
-#include <arch/interrupt.h>
-#include <stdbool.h>
-#include <byteorder.h>
-#include <sysinfo/sysinfo.h>
-#include <log.h>
 
 static void malta_init(void);
@@ -65 +57 @@
 };
 
-#ifdef CONFIG_NS16550
-static ns16550_instance_t *tty_instance;
-#endif
-#ifdef CONFIG_NS16550_OUT
-static outdev_t *tty_out;
-#endif
-
-static void malta_isa_irq_handler(unsigned int i)
-{
-        uint8_t isa_irq = host2uint32_t_le(pio_read_32(GT64120_PCI0_INTACK));
-        if (i8259_is_spurious(isa_irq)) {
-                i8259_handle_spurious(isa_irq);
-#ifdef CONFIG_DEBUG
-                log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt %u",
-                    CPU->id, isa_irq);
-                return;
-#endif
-        }
-        irq_t *irq = irq_dispatch_and_lock(isa_irq);
-        if (irq) {
-                irq->handler(irq);
-                irq_spinlock_unlock(&irq->lock, false);
-        } else {
-#ifdef CONFIG_DEBUG
-                log(LF_ARCH, LVL_DEBUG, "cpu%u: unhandled IRQ (irq=%u)",
-                    CPU->id, isa_irq);
-#endif
-        }
-        i8259_eoi(isa_irq);
-}
-
 void malta_init(void)
 {
-        irq_init(ISA_IRQ_COUNT, ISA_IRQ_COUNT);
-
-        i8259_init((i8259_t *) PIC0_BASE, (i8259_t *) PIC1_BASE, 0);
-        sysinfo_set_item_val("i8259", NULL, true);
-
-        int_handler[INT_HW0] = malta_isa_irq_handler;
-        cp0_unmask_int(INT_HW0);
-
-#if (defined(CONFIG_NS16550) || defined(CONFIG_NS16550_OUT))
-#ifdef CONFIG_NS16550_OUT
-        outdev_t **tty_out_ptr = &tty_out;
-#else
-        outdev_t **tty_out_ptr = NULL;
-#endif
-        tty_instance = ns16550_init((ioport8_t *) TTY_BASE, 0, TTY_ISA_IRQ,
-            NULL, NULL, tty_out_ptr);
-#endif
 }
 
@@ -129 +73 @@
 }
 
+#define YAMON_SUBR_BASE         PA2KA(0x1fc00500)
+#define YAMON_SUBR_PRINT_COUNT  (YAMON_SUBR_BASE + 0x4)
+
+typedef void (**yamon_print_count_ptr_t)(uint32_t, const char *, uint32_t);
+
+yamon_print_count_ptr_t yamon_print_count =
+    (yamon_print_count_ptr_t) YAMON_SUBR_PRINT_COUNT;
+
+static void yamon_putwchar(outdev_t *dev, const wchar_t wch)
+{
+
+        const char ch = (char) wch;
+
+        (*yamon_print_count)(0, &ch, 1);
+}
+
+static outdev_t yamon_outdev;
+static outdev_operations_t yamon_outdev_ops = {
+        .write = yamon_putwchar,
+        .redraw = NULL,
+        .scroll_up = NULL,
+        .scroll_down = NULL
+};
+
 void malta_output_init(void)
 {
-#ifdef CONFIG_NS16550_OUT
-        if (tty_out)
-                stdout_wire(tty_out);
-#endif
+        outdev_initialize("yamon", &yamon_outdev, &yamon_outdev_ops);
+        stdout_wire(&yamon_outdev);
 }
 
 void malta_input_init(void)
 {
-#ifdef CONFIG_NS16550
-        if (tty_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(tty_instance, srln);
-                        i8259_enable_irqs(1 << TTY_ISA_IRQ);
-                }
-        }
-#endif
+        (void) stdin_wire();
 }