Changeset 1787e527 in mainline for boot/genarch/ofw_tree.h

Timestamp:

2009-11-16T21:22:54Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• boot/genarch/ofw_tree.h (modified) (1 diff)

boot/genarch/ofw_tree.h

@@ -33 +33 @@
 #include <ofw.h>
 
-#define OFW_TREE_PROPERTY_MAX_NAMELEN   32
-
-typedef struct ofw_tree_node ofw_tree_node_t;
-typedef struct ofw_tree_property ofw_tree_property_t;
-
-/** Memory representation of OpenFirmware device tree node. */
-struct ofw_tree_node {
-        ofw_tree_node_t *parent;
-        ofw_tree_node_t *peer;
-        ofw_tree_node_t *child;
-
-        uint32_t node_handle;                   /**< Old OpenFirmware node handle. */
-
-        char *da_name;                          /**< Disambigued name. */
-
-        unsigned properties;                    /**< Number of properties. */
-        ofw_tree_property_t *property;
-        
-        void *device;                           /**< Member used solely by the kernel. */
-};
 
 /** Memory representation of OpenFirmware device tree node property. */
-struct ofw_tree_property {
+typedef struct {
         char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
         size_t size;
         void *value;
-};
+} ofw_tree_property_t;
+
+/** Memory representation of OpenFirmware device tree node. */
+typedef struct ofw_tree_node {
+        struct ofw_tree_node *parent;
+        struct ofw_tree_node *peer;
+        struct ofw_tree_node *child;
+        
+        uint32_t node_handle;           /**< Old OpenFirmware node handle. */
+        
+        char *da_name;                  /**< Disambigued name. */
+        
+        unsigned int properties;        /**< Number of properties. */
+        ofw_tree_property_t *property;
+        
+        void *device;                   /**< Member used solely by the kernel. */
+} ofw_tree_node_t;
 
 extern ofw_tree_node_t *ofw_tree_build(void);