Changeset d783145 in mainline for kernel/arch/sparc32/src/machine/leon3/leon3.c

Timestamp:

2013-10-20T21:51:39Z (12 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

817d939

Parents:

13c94f7

Message:

Finally plug in IRQMP and UART kernel drivers.

File:

• kernel/arch/sparc32/src/machine/leon3/leon3.c (modified) (3 diffs)

kernel/arch/sparc32/src/machine/leon3/leon3.c

@@ -43 +43 @@
 #include <genarch/drivers/grlib_uart/grlib_uart.h>
 #include <genarch/drivers/grlib_irqmp/grlib_irqmp.h>
+#include <genarch/srln/srln.h>
 
 #include <func.h>
@@ -130 +131 @@
 static void leon3_output_init(void)
 {
+        printf("leon3_output_init\n");
+        printf("machine.bootinfo=%p, machine.bootinfo->uart_base=0x%08x\n", machine.bootinfo, machine.bootinfo->uart_base);
+
         machine.scons_dev = grlib_uart_init(machine.bootinfo->uart_base, machine.bootinfo->uart_irq);
 
@@ -138 +142 @@
 static void leon3_input_init(void)
 {
+        grlib_uart_t *scons_inst;
+
         if (machine.scons_dev) {
+                /* Create input device. */
+                scons_inst = (void *)machine.scons_dev->data;
 
+                srln_instance_t *srln_instance = srln_init();
+                if (srln_instance) {
+                        indev_t *sink = stdin_wire();
+                        indev_t *srln = srln_wire(srln_instance, sink);
+                        grlib_uart_input_wire(scons_inst, srln);
+
+                        /* Enable interrupts from UART */
+                        grlib_irqmp_unmask(&machine.irqmp, machine.bootinfo->uart_irq);
+                }
         }
 }