Changeset c6588ce in mainline for kernel/genarch/src/ofw/ofw_tree.c

Timestamp:

2012-05-05T08:12:17Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (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/src/ofw/ofw_tree.c (modified) (13 diffs)

kernel/genarch/src/ofw/ofw_tree.c

@@ -38 +38 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <mm/slab.h>
+#include <sysinfo/sysinfo.h>
 #include <memstr.h>
 #include <str.h>
@@ -65 +66 @@
     const char *name)
 {
-        size_t i;
-        
-        for (i = 0; i < node->properties; i++) {
+        for (size_t i = 0; i < node->properties; i++) {
                 if (str_cmp(node->property[i].name, name) == 0)
                         return &node->property[i];
@@ -104 +103 @@
     const char *name)
 {
-        ofw_tree_node_t *cur;
-        
         /*
          * Try to find the disambigued name.
          */
-        for (cur = node->child; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node->child; cur; cur = cur->peer) {
                 if (str_cmp(cur->da_name, name) == 0)
                         return cur;
@@ -121 +118 @@
          * are not always fully-qualified.
          */
-        for (cur = node->child; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node->child; cur; cur = cur->peer) {
                 if (str_cmp(ofw_tree_node_name(cur), name) == 0)
                         return cur;
@@ -141 +138 @@
     const char *dtype)
 {
-        ofw_tree_node_t *cur;
-        
-        for (cur = node->child; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node->child; cur; cur = cur->peer) {
                 ofw_tree_property_t *prop =
                     ofw_tree_getprop(cur, "device_type");
@@ -172 +167 @@
     phandle handle)
 {
-        ofw_tree_node_t *cur;
-        
-        for (cur = root; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = root; cur; cur = cur->peer) {
                 if (cur->node_handle == handle)
                         return cur;
                 
                 if (cur->child) {
-                        ofw_tree_node_t *node
-                            = ofw_tree_find_node_by_handle(cur->child, handle);
+                        ofw_tree_node_t *node =
+                            ofw_tree_find_node_by_handle(cur->child, handle);
                         if (node)
                                 return node;
@@ -201 +194 @@
     const char *dtype)
 {
-        ofw_tree_node_t *cur;
-        
-        for (cur = node->peer; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node->peer; cur; cur = cur->peer) {
                 ofw_tree_property_t *prop =
                     ofw_tree_getprop(cur, "device_type");
@@ -229 +220 @@
     const char *name)
 {
-        ofw_tree_node_t *cur;
-        
-        for (cur = node->peer; cur; cur = cur->peer) {
-                ofw_tree_property_t *prop
-                    = ofw_tree_getprop(cur, "name");
+        for (ofw_tree_node_t *cur = node->peer; cur; cur = cur->peer) {
+                ofw_tree_property_t *prop =
+                    ofw_tree_getprop(cur, "name");
                 
                 if ((!prop) || (!prop->value))
@@ -259 +248 @@
         
         ofw_tree_node_t *node = ofw_root;
-        size_t i;
         size_t j;
         
-        for (i = 1; (i < str_size(path)) && (node); i = j + 1) {
+        for (size_t i = 1; (i < str_size(path)) && (node); i = j + 1) {
                 for (j = i; (j < str_size(path)) && (path[j] != '/'); j++);
                 
@@ -294 +282 @@
     const char *dtype, ofw_tree_walker_t walker, void *arg)
 {
-        ofw_tree_node_t *cur;
-        
-        for (cur = node; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node; cur; cur = cur->peer) {
                 ofw_tree_property_t *prop =
                     ofw_tree_getprop(cur, "device_type");
@@ -334 +320 @@
 }
 
-/** Print OpenFirmware device subtree rooted in a node.
+/** Get OpenFirmware node properties.
+ *
+ * @param item    Sysinfo item (unused).
+ * @param size    Size of the returned data.
+ * @param dry_run Do not get the data, just calculate the size.
+ * @param data    OpenFirmware node.
+ *
+ * @return Data containing a serialized dump of all node
+ *         properties. If the return value is not NULL, it
+ *         should be freed in the context of the sysinfo request.
+ *
+ */
+static void *ofw_sysinfo_properties(struct sysinfo_item *item, size_t *size,
+    bool dry_run, void *data)
+{
+        ofw_tree_node_t *node = (ofw_tree_node_t *) data;
+        
+        /* Compute serialized data size */
+        *size = 0;
+        for (size_t i = 0; i < node->properties; i++)
+                *size += str_size(node->property[i].name) + 1 +
+                    sizeof(node->property[i].size) + node->property[i].size;
+        
+        if (dry_run)
+                return NULL;
+        
+        void *dump = malloc(*size, FRAME_ATOMIC);
+        if (dump == NULL) {
+                *size = 0;
+                return NULL;
+        }
+        
+        /* Serialize the data */
+        size_t pos = 0;
+        for (size_t i = 0; i < node->properties; i++) {
+                /* Property name */
+                str_cpy(dump + pos, *size - pos, node->property[i].name);
+                pos += str_size(node->property[i].name) + 1;
+                
+                /* Value size */
+                memcpy(dump + pos, &node->property[i].size,
+                    sizeof(node->property[i].size));
+                pos += sizeof(node->property[i].size);
+                
+                /* Value */
+                memcpy(dump + pos, node->property[i].value,
+                    node->property[i].size);
+                pos += node->property[i].size;
+        }
+        
+        return ((void *) dump);
+}
+
+/** Map OpenFirmware device subtree rooted in a node into sysinfo.
  *
  * Child nodes are processed recursively and peer nodes are processed
@@ -343 +382 @@
  *
  */
-static void ofw_tree_node_print(ofw_tree_node_t *node, const char *path)
+static void ofw_tree_node_sysinfo(ofw_tree_node_t *node, const char *path)
 {
         char *cur_path = (char *) malloc(PATH_MAX_LEN, 0);
-        ofw_tree_node_t *cur;
-        
-        for (cur = node; cur; cur = cur->peer) {
-                if ((cur->parent) && (path)) {
-                        snprintf(cur_path, PATH_MAX_LEN, "%s/%s", path, cur->da_name);
-                        printf("%s\n", cur_path);
-                } else {
-                        snprintf(cur_path, PATH_MAX_LEN, "%s", cur->da_name);
-                        printf("/\n");
-                }
+        
+        for (ofw_tree_node_t *cur = node; cur; cur = cur->peer) {
+                if ((cur->parent) && (path))
+                        snprintf(cur_path, PATH_MAX_LEN, "%s.%s", path, cur->da_name);
+                else
+                        snprintf(cur_path, PATH_MAX_LEN, "firmware.%s", cur->da_name);
+                
+                sysinfo_set_item_gen_data(cur_path, NULL, ofw_sysinfo_properties,
+                    (void *) cur);
                 
                 if (cur->child)
-                        ofw_tree_node_print(cur->child, cur_path);
+                        ofw_tree_node_sysinfo(cur->child, cur_path);
         }
         
@@ -364 +402 @@
 }
 
-/** Print the structure of the OpenFirmware device tree. */
-void ofw_tree_print(void)
-{
-        ofw_tree_node_print(ofw_root, NULL);
+/** Map the OpenFirmware device tree into sysinfo. */
+void ofw_sysinfo_map(void)
+{
+        ofw_tree_node_sysinfo(ofw_root, NULL);
 }