Changeset 25a76ab8 in mainline for kernel/genarch/include/ofw/ofw_tree.h

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:

• kernel/genarch/include/ofw/ofw_tree.h (modified) (3 diffs)

kernel/genarch/include/ofw/ofw_tree.h

@@ -34 +34 @@
 #define OFW_TREE_PROPERTY_MAX_NAMELEN  32
 
+typedef uint32_t phandle;
+
 /** Memory representation of OpenFirmware device tree node property. */
 typedef struct {
@@ -47 +49 @@
         struct ofw_tree_node *child;
         
-        uint32_t node_handle;           /**< Old OpenFirmware node handle. */
+        phandle node_handle;            /**< Old OpenFirmware node handle. */
         
         char *da_name;                  /**< Disambigued name. */
         
-        unsigned int properties;        /**< Number of properties. */
+        size_t properties;              /**< Number of properties. */
         ofw_tree_property_t *property;
         
@@ -83 +85 @@
     const char *);
 extern ofw_tree_node_t *ofw_tree_find_node_by_handle(ofw_tree_node_t *,
-    uint32_t);
+    phandle);
 
 #endif