Changeset 3da166f0 in mainline for kernel/arch

Timestamp:

2014-12-08T19:34:48Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f42adef

Parents:

7785ebd7 (diff), 21b6307 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~martin-sucha/helenos/kernel-serial

Location:

kernel/arch

Files:

• amd64/include/arch/interrupt.h (modified) (1 diff)
• amd64/src/amd64.c (modified) (2 diffs)
• ia32/include/arch/interrupt.h (modified) (1 diff)
• ia32/src/ia32.c (modified) (2 diffs)
• ia64/src/ia64.c (modified) (1 diff)
• sparc64/src/drivers/kbd.c (modified) (1 diff)

kernel/arch/amd64/include/arch/interrupt.h

@@ -53 +53 @@
 #define IRQ_KBD       1
 #define IRQ_PIC1      2
+/* NS16550 at COM1 */
+#define IRQ_NS16550   4
 #define IRQ_PIC_SPUR  7
 #define IRQ_MOUSE     12

kernel/arch/amd64/src/amd64.c

@@ -49 +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>
@@ -212 +214 @@
         }
 #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)

kernel/arch/ia32/include/arch/interrupt.h

@@ -53 +53 @@
 #define IRQ_KBD       1
 #define IRQ_PIC1      2
+/* NS16550 at COM1 */
+#define IRQ_NS16550   4
 #define IRQ_PIC_SPUR  7
 #define IRQ_MOUSE     12

kernel/arch/ia32/src/ia32.c

@@ -50 +50 @@
 #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>
@@ -166 +168 @@
         }
 #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)

kernel/arch/ia64/src/ia64.c

@@ -173 +173 @@
 #ifdef CONFIG_NS16550
         ns16550_instance_t *ns16550_instance
-            = ns16550_init((ns16550_t *) NS16550_BASE, NS16550_IRQ, NULL, NULL);
+            = ns16550_init((ns16550_t *) NS16550_BASE, NS16550_IRQ, NULL, NULL,
+            NULL);
         if (ns16550_instance) {
                 srln_instance_t *srln_instance = srln_init();

kernel/arch/sparc64/src/drivers/kbd.c

@@ -122 +122 @@
         
         ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, inr, cir,
-            cir_arg);
+            cir_arg, NULL);
         if (ns16550_instance) {
                 kbrd_instance_t *kbrd_instance = kbrd_init();