Changeset b60c582 in mainline for kernel/genarch/src/ofw

Timestamp:

2009-04-03T08:02:30Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2398ee9

Parents:

9be1d58

Message:

update for string changes

Location:

kernel/genarch/src/ofw

Files:

• ebus.c (modified) (1 diff)
• fhc.c (modified) (1 diff)
• ofw_tree.c (modified) (7 diffs)
• pci.c (modified) (1 diff)

kernel/genarch/src/ofw/ebus.c

@@ -128 +128 @@
                 return false;
                 
-        if (strcmp(ofw_tree_node_name(controller), "pci") != 0) {
+        if (str_cmp(ofw_tree_node_name(controller), "pci") != 0) {
                 /*
                  * This is not a PCI node.

kernel/genarch/src/ofw/fhc.c

@@ -67 +67 @@
                                 return true;
                         }
-                        if (strcmp(ofw_tree_node_name(node->parent), "central") != 0)
+                        if (str_cmp(ofw_tree_node_name(node->parent), "central") != 0)
                                 panic("Unexpected parent node: %s.", ofw_tree_node_name(node->parent));
                         

kernel/genarch/src/ofw/ofw_tree.c

@@ -67 +67 @@
         
         for (i = 0; i < node->properties; i++) {
-                if (strcmp(node->property[i].name, name) == 0)
+                if (str_cmp(node->property[i].name, name) == 0)
                         return &node->property[i];
         }
@@ -110 +110 @@
          */
         for (cur = node->child; cur; cur = cur->peer) {
-                if (strcmp(cur->da_name, name) == 0)
+                if (str_cmp(cur->da_name, name) == 0)
                         return cur;
         }
@@ -122 +122 @@
          */
         for (cur = node->child; cur; cur = cur->peer) {
-                if (strcmp(ofw_tree_node_name(cur), name) == 0)
+                if (str_cmp(ofw_tree_node_name(cur), name) == 0)
                         return cur;
         }
@@ -147 +147 @@
                 if (!prop || !prop->value)
                         continue;
-                if (strcmp(prop->value, name) == 0)
+                if (str_cmp(prop->value, name) == 0)
                         return cur;
         }
@@ -204 +204 @@
                 if (!prop || !prop->value)
                         continue;
-                if (strcmp(prop->value, name) == 0)
+                if (str_cmp(prop->value, name) == 0)
                         return cur;
         }
@@ -230 +230 @@
                 if (!prop || !prop->value)
                         continue;
-                if (strcmp(prop->value, name) == 0)
+                if (str_cmp(prop->value, name) == 0)
                         return cur;
         }
@@ -253 +253 @@
                 return NULL;
         
-        for (i = 1; i < str_size(path) && node; i = j + 1) {
-                for (j = i; j < str_size(path) && path[j] != '/'; j++)
-                        ;
-                if (i == j)     /* skip extra slashes */
+        for (i = 1; (i < str_size(path)) && (node); i = j + 1) {
+                for (j = i; (j < str_size(path)) && (path[j] != '/'); j++);
+                
+                /* Skip extra slashes */
+                if (i == j)
                         continue;
-                        
+                
                 memcpy(buf, &path[i], j - i);
-                buf[j - i] = '\0';
+                buf[j - i] = 0;
                 node = ofw_tree_find_child(node, buf);
         }

kernel/genarch/src/ofw/pci.c

@@ -59 +59 @@
         prop = ofw_tree_getprop(node, "ranges");
         if (!prop) {
-                if (strcmp(ofw_tree_node_name(node->parent), "pci") == 0)
+                if (str_cmp(ofw_tree_node_name(node->parent), "pci") == 0)
                         return ofw_pci_apply_ranges(node->parent, reg, pa);
                 return false;