Changeset 25a76ab8 in mainline for boot/genarch/src/ofw_tree.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/genarch/src/ofw_tree.c (moved) (moved from boot/genarch/ofw_tree.c ) (10 diffs)

boot/genarch/src/ofw_tree.c

@@ -27 +27 @@
  */
 
-#include <ofw_tree.h>
-#include <ofw.h>
-#include <ofwarch.h>
-#include <types.h>
-#include <string.h>
+#include <genarch/ofw_tree.h>
+#include <genarch/ofw.h>
+#include <arch/ofw.h>
+#include <typedefs.h>
+#include <str.h>
 #include <balloc.h>
-#include <asm.h>
 #include <memstr.h>
 
+static char path[OFW_TREE_PATH_MAX_LEN + 1];
+static char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
+static char name2[OFW_TREE_PROPERTY_MAX_NAMELEN];
+
 static ofw_tree_node_t *ofw_tree_node_alloc(void)
 {
@@ -41 +44 @@
 }
 
-static ofw_tree_property_t *ofw_tree_properties_alloc(unsigned count)
+static ofw_tree_property_t *ofw_tree_properties_alloc(size_t count)
 {
         return balloc(count * sizeof(ofw_tree_property_t),
@@ -59 +62 @@
          * behind the requested memory.
          */
-        char *addr = balloc(size + 1, size);
+        char *addr = balloc(size + 1, 4);
         if (addr)
                 addr[size] = '\0';
@@ -99 +102 @@
                  * Get the disambigued name.
                  */
-                static char path[OFW_TREE_PATH_MAX_LEN + 1];
                 size_t len = ofw_package_to_path(current, path, OFW_TREE_PATH_MAX_LEN);
-                if (len == -1)
+                if (len == (size_t) -1)
                         return;
                 
@@ -107 +109 @@
                 
                 /* Find last slash */
-                int i;
-                for (i = len - 1; (i >= 0) && (path[i] != '/'); i--);
+                size_t i;
+                for (i = len; (i > 0) && (path[i - 1] != '/'); i--);
                 
                 /* Do not include the slash */
-                i++;
                 len -= i;
                 
@@ -127 +128 @@
                  */
                 phandle child = ofw_get_child_node(current);
-                if ((child != 0) && (child != -1)) {
+                if ((child != 0) && (child != (phandle) -1)) {
                         ofw_tree_node_t *child_node = ofw_tree_node_alloc();
                         if (child_node) {
@@ -140 +141 @@
                  * Count properties.
                  */
-                static char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
-                static char name2[OFW_TREE_PROPERTY_MAX_NAMELEN];
                 name[0] = '\0';
                 while (ofw_next_property(current, name, name2) == 1) {
@@ -188 +187 @@
                 current_node->property = (ofw_tree_property_t *) balloc_rebase(property);
                 
-                
                 /*
                  * Iteratively process the next peer node.
@@ -197 +195 @@
                  */
                 phandle peer = ofw_get_peer_node(current);
-                if ((peer != 0) && (peer != -1)) {
+                if ((peer != 0) && (peer != (phandle) -1)) {
                         ofw_tree_node_t *peer_node = ofw_tree_node_alloc();
                         if (peer_node) {
@@ -234 +232 @@
          */
         phandle ssm_node = ofw_find_device("/ssm@0,0");
-        if (ssm_node != -1) {
+        if (ssm_node != (phandle) -1) {
                 ofw_tree_node_t *ssm = ofw_tree_node_alloc();
                 if (ssm) {