Changeset 25a76ab8 in mainline for boot/genarch/include/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:

• boot/genarch/include/ofw_tree.h (moved) (moved from boot/genarch/ofw_tree.h ) (2 diffs)

boot/genarch/include/ofw_tree.h

@@ -30 +30 @@
 #define BOOT_OFW_TREE_H_
 
-#include <types.h>
-#include <ofw.h>
-
+#include <typedefs.h>
+#include <genarch/ofw.h>
 
 /** Memory representation of OpenFirmware device tree node property. */
@@ -47 +46 @@
         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;