WebSVN – HelenOS – Diff – /branches/dd/kernel/arch/sparc64/src/console.c

 /*
  * Copyright (c) 2005 Jakub Jermar
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * - Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
  * - The name of the author may not be used to endorse or promote products
  *   derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /** @addtogroup sparc64
  * @{
  */
 /** @file
  */
 #include <arch/console.h>
 #include <arch/types.h>
 #include <arch/drivers/scr.h>
 #include <arch/drivers/kbd.h>
 #include <arch/drivers/sgcn.h>
+#include <genarch/srln/srln.h>
 #include <console/chardev.h>
 #include <console/console.h>
 #include <arch/asm.h>
 #include <arch/register.h>
 #include <proc/thread.h>
 #include <arch/mm/tlb.h>
 #include <genarch/ofw/ofw_tree.h>
 #include <arch.h>
 #include <panic.h>
 #include <string.h>
 #include <print.h>
 #define KEYBOARD_POLL_PAUSE 50000   /* 50ms */
 /**
  * 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)
+{
 #ifdef CONFIG_FB
-    ofw_tree_property_t *prop;
-    ofw_tree_node_t *screen;
-    ofw_tree_node_t *keyboard;
-    prop = ofw_tree_getprop(aliases, "screen");
+    ofw_tree_property_t *prop_scr = ofw_tree_getprop(aliases, "screen");
-    if (!prop)
+    if (!prop_scr)
         panic("Cannot find property 'screen'.");
-    if (!prop->value)
+    if (!prop_scr->value)
         panic("Cannot find screen alias.");
-    screen = ofw_tree_lookup(prop->value);
+    ofw_tree_node_t *screen = ofw_tree_lookup(prop_scr->value);
     if (!screen)
-        panic("Cannot find %s.", prop->value);
+        panic("Cannot find %s.", prop_scr->value);
     scr_init(screen);
+#endif
+#ifdef CONFIG_SUN_KBD
-    prop = ofw_tree_getprop(aliases, "keyboard");
+    ofw_tree_property_t *prop_kbd = ofw_tree_getprop(aliases, "keyboard");
-    if (!prop)
+    if (!prop_kbd)
         panic("Cannot find property 'keyboard'.");
-    if (!prop->value)
+    if (!prop_kbd->value)
         panic("Cannot find keyboard alias.");
-    keyboard = ofw_tree_lookup(prop->value);
+    ofw_tree_node_t *keyboard = ofw_tree_lookup(prop_kbd->value);
     if (!keyboard)
-        panic("Cannot find %s.", prop->value);
+        panic("Cannot find %s.", prop_kbd->value);
     kbd_init(keyboard);
-#else
-    panic("Standard console requires FB, "
-          "but the kernel is not compiled with FB support.");
 #endif
+}
 /** Initilize I/O on the Serengeti machine. */
 static void serengeti_init(void)
+{
+#ifdef CONFIG_SGCN_KBD
+    indev_t *kbrdin;
+    kbrdin = sgcnin_init();
+    if (kbrdin)
+        srlnin_init(kbrdin);
+#endif
+#ifdef CONFIG_SGCN_PRN
-    sgcn_init();
+    sgcnout_init();
+#endif
+}
 /**
  * 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("Cannot find '/aliases'.");
     /* "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.
- *
- * @param arg Ignored.
- */
-void kkbdpoll(void *arg)
-{
-    thread_detach(THREAD);
-    if (kbd_type != KBD_SGCN)
-        return;
-    while (1) {
-#ifdef CONFIG_SGCN
-        if (kbd_type == KBD_SGCN)
-            sgcn_poll();
-#endif
-        thread_usleep(KEYBOARD_POLL_PAUSE);
-    }
-}
 /** Acquire console back for kernel
+ *
  */
 void arch_grab_console(void)
+{
 #ifdef CONFIG_FB
     scr_redraw();
 #endif
     switch (kbd_type) {
 #ifdef CONFIG_SGCN
     case KBD_SGCN:
         sgcn_grab();
         break;
 #endif
     default:
         break;
+    }
+}
 /** Return console to userspace
+ *
  */
 void arch_release_console(void)
+{
     switch (kbd_type) {
 #ifdef CONFIG_SGCN
     case KBD_SGCN:
         sgcn_release();
         break;
 #endif
     default:
         break;
+    }
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/dd/kernel/arch/sparc64/src/console.c – Rev 4055 → 4156