WebSVN – HelenOS – Diff – /branches/sparc/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>
 #if defined (SUN4U)
     #ifdef CONFIG_Z8530
     #include <genarch/kbd/z8530.h>
     #endif
     #ifdef CONFIG_NS16550
     #include <genarch/kbd/ns16550.h>
     #endif
 #elif defined (SUN4V)
     #include <arch/drivers/niagara.h>
 #endif
 #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 <func.h>
 #include <print.h>
 #define KEYBOARD_POLL_PAUSE 50000   /* 50ms */
-#if defined (SUN4U)
-/**
- * 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_property_t *prop;
-    ofw_tree_node_t *screen;
-    ofw_tree_node_t *keyboard;
-    prop = ofw_tree_getprop(aliases, "screen");
-    if (!prop)
-        panic("Can't find property \"screen\".\n");
-    if (!prop->value)
-        panic("Can't find screen alias.\n");
-    screen = ofw_tree_lookup(prop->value);
-    if (!screen)
-        panic("Can't find %s\n", prop->value);
-    scr_init(screen);
-    prop = ofw_tree_getprop(aliases, "keyboard");
-    if (!prop)
-        panic("Can't find property \"keyboard\".\n");
-    if (!prop->value)
-        panic("Can't find keyboard alias.\n");
-    keyboard = ofw_tree_lookup(prop->value);
-    if (!keyboard)
-        panic("Can't find %s\n", prop->value);
-    kbd_init(keyboard);
-}
-/** Initilize I/O on the Serengeti machine. */
-static void serengeti_init(void)
-{
-    sgcn_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)
-{
-#if defined (SUN4U)
-    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();
-    }
-#elif defined (SUN4V)
-    niagara_init();
-#endif
-}
 /** Kernel thread for polling keyboard.
+ *
  * @param arg Ignored.
  */
 void kkbdpoll(void *arg)
+{
     thread_detach(THREAD);
 #ifdef CONFIG_Z8530
     if (kbd_type == KBD_Z8530) {
         /*
          * The z8530 driver is interrupt-driven.
          */
         return;
+    }
 #endif
 #ifdef CONFIG_NS16550
 #ifdef CONFIG_NS16550_INTERRUPT_DRIVEN
     if (kbd_type == KBD_NS16550) {
         /*
          * The ns16550 driver is interrupt-driven.
          */
         return;
+    }
 #endif
 #endif
     while (1) {
 #ifdef CONFIG_NS16550
 #ifndef CONFIG_NS16550_INTERRUPT_DRIVEN
         if (kbd_type == KBD_NS16550)
             ns16550_poll();
 #endif
 #endif
 #ifdef CONFIG_SGCN
         if (kbd_type == KBD_SGCN)
             sgcn_poll();
 #endif
 #ifdef SUN4V
         if (kbd_type == KBD_SUN4V)
             niagara_poll();
 #endif
         thread_usleep(KEYBOARD_POLL_PAUSE);
+    }
+}
-/** Acquire console back for kernel
- *
- */
-void arch_grab_console(void)
-{
-    scr_redraw();
-    switch (kbd_type) {
-#ifdef CONFIG_Z8530
-    case KBD_Z8530:
-        z8530_grab();
-        break;
-#endif
-#ifdef CONFIG_NS16550
-    case KBD_NS16550:
-        ns16550_grab();
-        break;
-#endif
-#ifdef CONFIG_SGCN
-    case KBD_SGCN:
-        sgcn_grab();
-        break;
-#endif
-#ifdef SUN4V
-    case KBD_SUN4V:
-        niagara_grab();
-        break;
-#endif
-    default:
-        break;
-    }
-}
-/** Return console to userspace
- *
- */
-void arch_release_console(void)
-{
-    switch (kbd_type) {
-#ifdef CONFIG_Z8530
-    case KBD_Z8530:
-        z8530_release();
-        break;
-#endif
-#ifdef CONFIG_NS16550
-    case KBD_NS16550:
-        ns16550_release();
-        break;
-#endif
-#ifdef CONFIG_SGCN
-    case KBD_SGCN:
-        sgcn_release();
-        break;
-#endif
-#ifdef SUN4V
-    case KBD_SUN4V:
-        niagara_release();
-        break;
-#endif
-    default:
-        break;
-    }
-}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/sparc/kernel/arch/sparc64/src/console.c @ 3745 – Rev 4073 → 4130