Changeset 28ecadb in mainline for kernel/arch/sparc64/src/console.c

Timestamp:

2006-09-22T21:44:54Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5d684e4

Parents:

16529d5

Message:

Convert sparc64 to detect keyboard and determine
its physical address by walking the memory representation
of the OpenFirmware device tree.

Add bus-specific functions that know how to apply the
"ranges" property to one component of the "reg" property.
Buses supported so far include FHC, EBUS and PCI.

File:

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

kernel/arch/sparc64/src/console.c

@@ -54 +54 @@
 #include <arch/mm/tlb.h>
 #include <arch/boot/boot.h>
+#include <genarch/ofw/ofw_tree.h>
 #include <arch.h>
+#include <panic.h>
+#include <print.h>
 
 #define KEYBOARD_POLL_PAUSE     50000   /* 50ms */
@@ -62 +65 @@
 {
         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");
+        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);
+
         fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height,
                 bootinfo.screen.bpp, bootinfo.screen.scanline, true);
+        
+        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);
 
-#ifdef KBD_ADDR_OVRD
-        if (!bootinfo.keyboard.addr)
-                bootinfo.keyboard.addr = KBD_ADDR_OVRD;
-#endif
-
-        if (bootinfo.keyboard.addr)
-                kbd_init();
+        kbd_init(keyboard);
 }
 
@@ -83 +107 @@
         thread_detach(THREAD);
 
-        if (!bootinfo.keyboard.addr)
-                return;
-                
-        while (1) {
 #ifdef CONFIG_Z8530
+        if (kbd_type == KBD_Z8530)
                 return;
 #endif
+
+        while (1) {
 #ifdef CONFIG_NS16550
-                ns16550_poll();
+                if (kbd_type == KBD_NS16550)
+                        ns16550_poll();
 #endif
                 thread_usleep(KEYBOARD_POLL_PAUSE);
@@ -103 +127 @@
 {
 #ifdef CONFIG_Z8530
-        z8530_grab();
+        if (kbd_type == KBD_Z8530)
+                z8530_grab();
 #endif
 }
@@ -113 +138 @@
 {
 #ifdef CONFIG_Z8530
-        z8530_release();
+        if (kbd_type == KBD_Z8530)
+                z8530_release();
 #endif
 }