Changeset 965dc18 in mainline for kernel/arch/sparc64/src/console.c

Timestamp:

2008-12-05T19:59:03Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

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

kernel/arch/sparc64/src/console.c

@@ -39 +39 @@
 #include <arch/drivers/kbd.h>
 
+#include <arch/drivers/sgcn.h>
+
 #ifdef CONFIG_Z8530
 #include <genarch/kbd/z8530.h>
@@ -55 +57 @@
 #include <arch.h>
 #include <panic.h>
+#include <func.h>
 #include <print.h>
 
 #define KEYBOARD_POLL_PAUSE     50000   /* 50ms */
 
-/** Initialize kernel console to use framebuffer and keyboard directly. */
-void standalone_sparc64_console_init(void)
+/**
+ * Initialize kernel console to use framebuffer and keyboard directly.
+ * Called on UltraSPARC machines with standard keyboard and framebuffer.
+ *
+ * @param aliases       the "/aliases" OBP node 
+ */
+static void standard_console_init(ofw_tree_node_t *aliases)
 {
         stdin = NULL;
 
-        ofw_tree_node_t *aliases;
         ofw_tree_property_t *prop;
         ofw_tree_node_t *screen;
         ofw_tree_node_t *keyboard;
-        
-        aliases = ofw_tree_lookup("/aliases");
-        if (!aliases)
-                panic("Can't find /aliases.\n");
         
         prop = ofw_tree_getprop(aliases, "screen");
@@ -96 +99 @@
 }
 
+/** Initilize I/O on the Serengeti machine. */
+static void serengeti_init(void)
+{
+        sgcn_init();
+}
+
+/**
+ * Initialize input/output. Auto-detects the type of machine
+ * and calls the appropriate I/O init routine. 
+ */
+void standalone_sparc64_console_init(void)
+{
+        ofw_tree_node_t *aliases;
+        ofw_tree_property_t *prop;
+        
+        aliases = ofw_tree_lookup("/aliases");
+        if (!aliases)
+                panic("Can't find /aliases.\n");
+        
+        /* "def-cn" = "default console" */
+        prop = ofw_tree_getprop(aliases, "def-cn");
+        
+        if ((!prop) || (!prop->value) || (strcmp(prop->value, "/sgcn") != 0)) {
+                standard_console_init(aliases);
+        } else {
+                serengeti_init();
+        }
+}
+
+
 /** Kernel thread for polling keyboard.
  *
@@ -130 +163 @@
 #endif
 #endif
+#ifdef CONFIG_SGCN
+                if (kbd_type == KBD_SGCN)
+                        sgcn_poll();
+#endif
                 thread_usleep(KEYBOARD_POLL_PAUSE);
         }
@@ -150 +187 @@
                 break;
 #endif
+#ifdef CONFIG_SGCN
+        case KBD_SGCN:
+                sgcn_grab();
+                break;
+#endif
         default:
                 break;
@@ -171 +213 @@
                 break;
 #endif
+#ifdef CONFIG_SGCN
+        case KBD_SGCN:
+                sgcn_release();
+                break;
+#endif
         default:
                 break;