Changeset 5869ce0 in mainline for kernel/generic/include/sysinfo/sysinfo.h

Timestamp:

2012-03-01T23:22:32Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0030eef

Parents:

3d23553

Message:

extend sysinfo generated subtree interface

File:

• kernel/generic/include/sysinfo/sysinfo.h (modified) (4 diffs)

kernel/generic/include/sysinfo/sysinfo.h

@@ -73 +73 @@
 typedef union {
         sysarg_t val;               /**< Constant numberic value */
+        sysinfo_data_t data;        /**< Constant binary data */
         sysinfo_fn_val_t fn_val;    /**< Generated numeric value function */
         sysinfo_fn_data_t fn_data;  /**< Generated binary data function */
-        sysinfo_data_t data;        /**< Constant binary data */
 } sysinfo_item_val_t;
 
@@ -95 +95 @@
 
 /** Generated subtree function */
-typedef sysinfo_return_t (*sysinfo_fn_subtree_t)(const char *, bool);
+typedef sysinfo_return_t (*sysinfo_fn_subtree_t)(const char *, bool, void *);
+
+/** Sysinfo generated subtree data
+ *
+ */
+typedef struct {
+        sysinfo_fn_subtree_t fn;  /**< Generated subtree function */
+        void *data;               /**< Private data */
+} sysinfo_fn_subtree_data_t;
 
 /** Sysinfo subtree (union)
@@ -101 +109 @@
  */
 typedef union {
-        struct sysinfo_item *table;     /**< Fixed subtree (list of subitems) */
-        sysinfo_fn_subtree_t get_data;  /**< Generated subtree function */
+        struct sysinfo_item *table;           /**< Fixed subtree (list of subitems) */
+        sysinfo_fn_subtree_data_t generator;  /**< Generated subtree */
 } sysinfo_subtree_t;
 
@@ -130 +138 @@
 
 extern void sysinfo_set_subtree_fn(const char *, sysinfo_item_t **,
-    sysinfo_fn_subtree_t);
+    sysinfo_fn_subtree_t, void *);
 
 extern void sysinfo_init(void);