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

  * 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>
-#ifdef CONFIG_Z8530
-#include <genarch/kbd/z8530.h>
+#include <genarch/srln/srln.h>
-#endif
-#ifdef CONFIG_NS16550
-#include <genarch/kbd/ns16550.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 <string.h>
 #include <print.h>
 #define KEYBOARD_POLL_PAUSE 50000   /* 50ms */
 /**
+ *
  * @param aliases   the "/aliases" OBP node
  */
 static void standard_console_init(ofw_tree_node_t *aliases)
+{
-    stdin = NULL;
+#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("Can't find property \"screen\".\n");
+        panic("Cannot find property 'screen'.");
-    if (!prop->value)
+    if (!prop_scr->value)
-        panic("Can't find screen alias.\n");
+        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("Can't find %s\n", 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("Can't find property \"keyboard\".\n");
+        panic("Cannot find property 'keyboard'.");
-    if (!prop->value)
+    if (!prop_kbd->value)
-        panic("Can't find keyboard alias.\n");
+        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("Can't find %s\n", prop->value);
+        panic("Cannot find %s.", prop_kbd->value);
     kbd_init(keyboard);
+#endif
+}
 /** 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
-    sgcn_init();
+    sgcnout_init();
+#endif
+}
 /**
  * Initialize input/output. Auto-detects the type of machine
  * and calls the appropriate I/O init routine.
     ofw_tree_node_t *aliases;
     ofw_tree_property_t *prop;
     aliases = ofw_tree_lookup("/aliases");
     if (!aliases)
-        panic("Can't find /aliases.\n");
+        panic("Cannot find '/aliases'.");
     /* "def-cn" = "default console" */
     prop = ofw_tree_getprop(aliases, "def-cn");
-    if ((!prop) || (!prop->value) || (strcmp(prop->value, "/sgcn") != 0)) {
+    if ((!prop) || (!prop->value) || (str_cmp(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);
-#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
-        thread_usleep(KEYBOARD_POLL_PAUSE);
-    }
-}
 /** Acquire console back for kernel
+ *
  */
 void arch_grab_console(void)
+{
-    switch (kbd_type) {
-#ifdef CONFIG_Z8530
+#ifdef CONFIG_FB
-    case KBD_Z8530:
-        z8530_grab();
+    scr_redraw();
-        break;
 #endif
-#ifdef CONFIG_NS16550
-    case KBD_NS16550:
-        ns16550_grab();
-        break;
-#endif
-#ifdef CONFIG_SGCN
+#ifdef CONFIG_SGCN_KBD
-    case KBD_SGCN:
-        sgcn_grab();
+    sgcn_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
+#ifdef CONFIG_SGCN_KBD
-    case KBD_SGCN:
-        sgcn_release();
+    sgcn_release();
-        break;
 #endif
-    default:
-        break;
-    }
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/tracing/kernel/arch/sparc64/src/console.c @ 3675 – Rev 3675 → 4377