Changeset 16529d5 in mainline for boot

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:

boot/genarch

Files:

• ofw.c (modified) (2 diffs)
• ofw.h (modified) (2 diffs)
• ofw_tree.c (modified) (5 diffs)
• ofw_tree.h (modified) (1 diff)

boot/genarch/ofw.c

@@ -115 +115 @@
 }
 
-int ofw_get_property(const phandle device, const char *name, const void *buf, const int buflen)
+int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen)
 {
         return ofw_call("getprop", 4, 1, NULL, device, name, buf, buflen);
@@ -128 +128 @@
 {
         return ofw_call("nextprop", 3, 1, NULL, device, previous, buf);
+}
+
+int ofw_package_to_path(const phandle device, char *buf, const int buflen)
+{
+        return ofw_call("package-to-path", 3, 1, NULL, device, buf, buflen);
 }
 

boot/genarch/ofw.h

@@ -103 +103 @@
 extern void ofw_write(const char *str, const int len);
 
-extern int ofw_get_property(const phandle device, const char *name, const void *buf, const int buflen);
+extern int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen);
 extern int ofw_get_proplen(const phandle device, const char *name);
 extern int ofw_next_property(const phandle device, char *previous, char *buf);
@@ -110 +110 @@
 extern phandle ofw_get_peer_node(const phandle node);
 extern phandle ofw_find_device(const char *name);
+
+extern int ofw_package_to_path(const phandle device, char *buf, const int buflen);
 
 extern int ofw(ofw_args_t *arg);

boot/genarch/ofw_tree.c

@@ -32 +32 @@
 #include <string.h>
 #include <balloc.h>
+#include <asm.h>
+
+#define MAX_PATH_LEN    256
 
 static ofw_tree_node_t *ofw_tree_node_alloc(void)
@@ -62 +65 @@
         ofw_tree_node_t *parent_node, phandle current)
 {
+        static char path[MAX_PATH_LEN+1];
+        static char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
         phandle peer;
         phandle child;
         unsigned properties = 0;
-        char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
+        size_t len;
+        int i;
 
         /*
@@ -77 +83 @@
         
         /*
+         * Get the disambigued name.
+         */
+        len = ofw_package_to_path(current, path, MAX_PATH_LEN);
+        if (len == -1)
+                return;
+        
+        path[len] = '\0';
+        for (i = len - 1; i >= 0 && path[i] != '/'; i--)
+                ;
+        i++;                                                            /* do not include '/' */
+        
+        len -= i;
+        current_node->da_name = ofw_tree_space_alloc(len + 1);          /* add space for trailing '\0' */
+        if (!current_node->da_name)
+                return;
+        
+        memcpy(current_node->da_name, &path[i], len);
+        current_node->da_name[len] = '\0';
+        
+        /*
          * Recursively process the potential peer node.
          */
@@ -85 +111 @@
                 peer_node = ofw_tree_node_alloc();
                 if (peer_node) {
-                        ofw_tree_node_process(peer_node, current_node, peer);
+                        ofw_tree_node_process(peer_node, parent_node, peer);
                         current_node->peer = peer_node;
                 }
@@ -121 +147 @@
                 return;
                 
-        int i = 0;
-
         name[0] = '\0';
         for (i = 0; ofw_next_property(current, name, name) == 1; i++) {

boot/genarch/ofw_tree.h

@@ -44 +44 @@
         ofw_tree_node_t *child;
 
+        char *da_name;                          /**< Disambigued name. */
+
         unsigned properties;                    /**< Number of properties. */
         ofw_tree_property_t *property;