Changeset 24b06199 in mainline

Timestamp:

2012-10-28T22:45:25Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

5030acad

Parents:

3296df5

Message:

Add option for ns16550 to be used as dummy serial output.

Files:

• HelenOS.config (modified) (3 diffs)
• kernel/arch/amd64/src/amd64.c (modified) (2 diffs)
• kernel/arch/ia32/src/ia32.c (modified) (2 diffs)

HelenOS.config

@@ -428 +428 @@
 
 % PC keyboard support
-! [CONFIG_HID_IN=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
 
 % PC keyboard support
@@ -457 +457 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&PLATFORM=ia64&MACHINE=i460GX] CONFIG_NS16550 (y/n)
 
-% Support for NS16550 controller
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_NS16550 (y/n)
+% Support for NS16550 controller (kernel console)
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial|CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_NS16550_KCON (y/n)
+
+% Use NS16550 controller as serial input (kernel console)
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_NS16550_KCON=y] CONFIG_NS16550 (y)
+
+% Use NS16550 controller as dummy serial output (kernel console)
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_NS16550_KCON=y] CONFIG_NS16550_DSRLNOUT (y)
 
 % Support for ARM926 on-chip UART
@@ -485 +491 @@
 
 % Dummy serial line output
-! [CONFIG_MIPS_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
+! [CONFIG_MIPS_PRN=y|CONFIG_ARM_PRN=y|CONFIG_NS16550_DSRLNOUT=y] CONFIG_DSRLNOUT (y)
 
 % Serial line input module

kernel/arch/amd64/src/amd64.c

@@ -55 +55 @@
 #include <genarch/kbrd/kbrd.h>
 #include <genarch/srln/srln.h>
+#include <genarch/drivers/dsrln/dsrlnout.h>
 #include <genarch/multiboot/multiboot.h>
 #include <genarch/multiboot/multiboot2.h>
@@ -234 +235 @@
         }
 #endif
+
+#ifdef CONFIG_NS16550_DSRLNOUT
+        /*
+         * Initialize dummy serial output to the ns16550.
+         */
+        outdev_t *dsrlndev = dsrlnout_init(NS16550_BASE);
+        if (dsrlndev) {
+                stdout_wire(dsrlndev);
+        }
+#endif
         
         if (irqs_info != NULL)

kernel/arch/ia32/src/ia32.c

@@ -56 +56 @@
 #include <genarch/kbrd/kbrd.h>
 #include <genarch/srln/srln.h>
+#include <genarch/drivers/dsrln/dsrlnout.h>
 #include <genarch/multiboot/multiboot.h>
 #include <genarch/multiboot/multiboot2.h>
@@ -189 +190 @@
 #endif
         
+#ifdef CONFIG_NS16550_DSRLNOUT
+        /*
+         * Initialize dummy serial output to the ns16550.
+         */
+        outdev_t *dsrlndev = dsrlnout_init(NS16550_BASE);
+        if (dsrlndev) {
+                stdout_wire(dsrlndev);
+        }
+#endif
+        
         if (irqs_info != NULL)
                 sysinfo_set_item_val(irqs_info, NULL, true);