Changeset 86ffa27f in mainline for kernel/arch/sparc64/src/console.c

Timestamp:

2011-08-07T11:21:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (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 mainline changes.

File:

• kernel/arch/sparc64/src/console.c (modified) (3 diffs)

kernel/arch/sparc64/src/console.c

@@ -38 +38 @@
 #include <arch/drivers/scr.h>
 #include <arch/drivers/kbd.h>
-#include <arch/drivers/sgcn.h>
 #include <genarch/srln/srln.h>
 #include <console/chardev.h>
@@ -89 +88 @@
 }
 
-/** Initilize I/O on the Serengeti machine. */
-static void serengeti_init(void)
-{
-#ifdef CONFIG_SGCN_KBD
-        sgcn_instance_t *sgcn_instance = sgcnin_init();
-        if (sgcn_instance) {
-                srln_instance_t *srln_instance = srln_init();
-                if (srln_instance) {
-                        indev_t *sink = stdin_wire();
-                        indev_t *srln = srln_wire(srln_instance, sink);
-                        sgcnin_wire(sgcn_instance, srln);
-                }
-        }
-#endif
-        
-#ifdef CONFIG_SGCN_PRN
-        outdev_t *sgcndev = sgcnout_init();
-        if (sgcndev)
-                stdout_wire(sgcndev);
-#endif
-}
-
 /**
  * Initialize input/output. Auto-detects the type of machine
@@ -127 +104 @@
         prop = ofw_tree_getprop(aliases, "def-cn");
         
-        if ((!prop) || (!prop->value) || (str_cmp(prop->value, "/sgcn") != 0)) {
+        if ((!prop) || (!prop->value))
                 standard_console_init(aliases);
-        } else {
-                serengeti_init();
-        }
 }