Changeset 28ecadb in mainline for boot/genarch/ofw_tree.c

Timestamp:

2006-09-22T21:44:54Z (18 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:

• boot/genarch/ofw_tree.c (modified) (2 diffs)

boot/genarch/ofw_tree.c

@@ -48 +48 @@
 static void * ofw_tree_space_alloc(size_t size)
 {
-        return balloc(size, size);
+        char *addr;
+
+        /*
+         * What we do here is a nasty hack :-)
+         * Problem: string property values that are allocated via this
+         * function typically do not contain the trailing '\0'. This
+         * is very uncomfortable for kernel, which is supposed to deal
+         * with the properties.
+         * Solution: when allocating space via this function, we always
+         * allocate space for the extra '\0' character that we store
+         * behind the requested memory.
+         */
+        addr = balloc(size + 1, size);
+        if (addr)
+                addr[size] = '\0';
+        return addr;
 }
 
@@ -154 +169 @@
                         break;
                 
-                strncpy(current_node->property[i].name, name, sizeof(name));
+                memcpy(current_node->property[i].name, name, OFW_TREE_PROPERTY_MAX_NAMELEN);
+                current_node->property[i].name[OFW_TREE_PROPERTY_MAX_NAMELEN] = '\0';
 
                 size = ofw_get_proplen(current, name);