Changeset 16529d5 in mainline for kernel

Timestamp:

2006-09-20T20:31:44Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

28ecadb

Parents:

61e90dd

Message:

More ofw_tree work and fixes.
Add ofw_tree_lookup().
Every ofw_tree_node now also contains a disambigued name which is essential for tree lookups.

Location:

kernel

Files:

• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/src/sparc64.c (modified) (2 diffs)
• genarch/Makefile.inc (modified) (1 diff)
• genarch/include/ofw/ofw_tree.h (modified) (3 diffs)
• genarch/src/ofw/ofw_tree.c (modified) (1 diff)

kernel/arch/sparc64/Makefile.inc

@@ -61 +61 @@
 CONFIG_FB = y
 
+## Compile with support for OpenFirmware device tree.
+#
+
+CONFIG_OFW_TREE = y
 
 ifeq ($(MACHINE),enterprise)

kernel/arch/sparc64/src/sparc64.c

@@ -46 +46 @@
 #include <arch/mm/page.h>
 #include <arch/stack.h>
+#include <genarch/ofw/ofw_tree.h>
 #include <userspace.h>
 
@@ -65 +66 @@
         ballocs.base = bootinfo.ballocs.base;
         ballocs.size = bootinfo.ballocs.size;
+        
+        ofw_tree_init(bootinfo.ofw_root);
 }
 

kernel/genarch/Makefile.inc

@@ -93 +93 @@
 ifeq ($(CONFIG_OFW_TREE), y)
         GENARCH_SOURCES += \
-                genarch/src/ofw/ofw_tree,c
+                genarch/src/ofw/ofw_tree.c
 endif

kernel/genarch/include/ofw/ofw_tree.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 
 #define OFW_TREE_PROPERTY_MAX_NAMELEN   32
@@ -43 +44 @@
         ofw_tree_node_t *child;
 
-        unsigned properties;                    /**< Number of properties. */
+        char *da_name;                                  /**< Disambigued name. */
+
+        unsigned properties;                            /**< Number of properties. */
         ofw_tree_property_t *property;
 };
@@ -54 +57 @@
 };
 
+extern void ofw_tree_init(ofw_tree_node_t *root);
+extern void ofw_tree_print(void);
+extern const char *ofw_tree_node_name(const ofw_tree_node_t *node);
+extern ofw_tree_node_t *ofw_tree_lookup(const char *path);
+
 #endif

kernel/genarch/src/ofw/ofw_tree.c

@@ -36 +36 @@
  */
 
+#include <genarch/ofw/ofw_tree.h>
+#include <arch/memstr.h>
+#include <func.h>
+#include <print.h>
+#include <panic.h>
+
+#define PATH_MAX_LEN    80
+#define NAME_BUF_LEN    50
+
+static ofw_tree_node_t *ofw_root;
+
+void ofw_tree_init(ofw_tree_node_t *root)
+{
+        ofw_root = root;
+}
+
+/** Return value of the 'name' property.
+ *
+ * @param node Node of interest.
+ *
+ * @return Value of the 'name' property belonging to the node.
+ */
+const char *ofw_tree_node_name(const ofw_tree_node_t *node)
+{
+        int i;
+        
+        for (i = 0; i < node->properties; i++) {
+                if (strncmp(node->property[i].name, "name", strlen("name")) == 0) {
+                        if (node->property[i].size < 2)
+                                panic("Invalid name property.\n");
+                        return node->property[i].value;
+                }
+        }
+        
+        panic("Node without name property.\n");
+}
+
+/** Lookup child of given name.
+ *
+ * @param node Node whose child is being looked up.
+ * @param da_name Disambigued name of the child being looked up.
+ *
+ * @return NULL if there is no such child or pointer to the matching child node.
+ */
+static ofw_tree_node_t *ofw_tree_find_child(ofw_tree_node_t *node, const char *da_name)
+{
+        ofw_tree_node_t *cur;
+        
+        for (cur = node->child; cur; cur = cur->peer) {
+                if (strncmp(cur->da_name, da_name, strlen(da_name)) == 0)
+                        return cur;
+        }
+        
+        return NULL;
+}
+
+/** Lookup OpenFirmware node by its path.
+ *
+ * @param path Path to the node.
+ *
+ * @return NULL if there is no such node or pointer to the leaf node.
+ */
+ofw_tree_node_t *ofw_tree_lookup(const char *path)
+{
+        char buf[NAME_BUF_LEN+1];
+        ofw_tree_node_t *node = ofw_root;
+        index_t i, j;
+        
+        if (path[0] != '/')
+                return NULL;
+        
+        for (i = 1; i < strlen(path) && node; i = j + 1) {
+                for (j = i; j < strlen(path) && path[j] != '/'; j++)
+                        ;
+                if (i == j)     /* skip extra slashes */
+                        continue;
+                        
+                memcpy(buf, &path[i], j - i);
+                buf[j - i] = '\0';
+                node = ofw_tree_find_child(node, buf);
+        }
+        
+        return node;
+}
+
+/** Recursively print subtree rooted in a node.
+ *
+ * @param node Root of the subtree.
+ * @param path Current path, NULL for the very root of the entire tree.
+ */
+static void ofw_tree_node_print(const ofw_tree_node_t *node, const char *path)
+{
+        char p[PATH_MAX_LEN];
+        
+        if (node->parent) {
+                snprintf(p, PATH_MAX_LEN, "%s/%s", path, node->da_name);
+                printf("%s\n", p);
+        } else {
+                snprintf(p, PATH_MAX_LEN, "%s", node->da_name);
+                printf("/\n");
+        }
+
+        if (node->child)
+                ofw_tree_node_print(node->child, p);
+        
+        if (node->peer)
+                ofw_tree_node_print(node->peer, path);
+}
+
+/** Print the structure of the OpenFirmware device tree. */
+void ofw_tree_print(void)
+{
+        ofw_tree_node_print(ofw_root, NULL);
+}
+
 /** @}
  */