Changes in kernel/generic/include/sysinfo/sysinfo.h [196c253:9a426d1f] in mainline

File:

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

kernel/generic/include/sysinfo/sysinfo.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Jakub Vana
- * Copyright (c) 2012 Martin Decky
  * All rights reserved.
  *
@@ -55 +54 @@
 struct sysinfo_item;
 
-/** Generated numeric value function */
-typedef sysarg_t (*sysinfo_fn_val_t)(struct sysinfo_item *, void *);
-
-/** Sysinfo generated numberic value data
- *
- */
-typedef struct {
-        sysinfo_fn_val_t fn;  /**< Generated value function */
-        void *data;           /**< Private data */
-} sysinfo_gen_val_data_t;
+/** Gerated numeric value function */
+typedef sysarg_t (*sysinfo_fn_val_t)(struct sysinfo_item *);
 
 /** Generated binary data function */
-typedef void *(*sysinfo_fn_data_t)(struct sysinfo_item *, size_t *, bool,
-    void *);
-
-/** Sysinfo generated binary data data
- *
- */
-typedef struct {
-        sysinfo_fn_data_t fn;  /**< Generated binary data function */
-        void *data;            /**< Private data */
-} sysinfo_gen_data_data_t;
+typedef void *(*sysinfo_fn_data_t)(struct sysinfo_item *, size_t *, bool);
 
 /** Sysinfo item binary data
@@ -90 +72 @@
  */
 typedef union {
-        sysarg_t val;                      /**< Constant numberic value */
-        sysinfo_data_t data;               /**< Constant binary data */
-        sysinfo_gen_val_data_t gen_val;    /**< Generated numeric value function */
-        sysinfo_gen_data_data_t gen_data;  /**< Generated binary data function */
+        sysarg_t val;               /**< Constant numberic value */
+        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;
 
@@ -113 +95 @@
 
 /** Generated subtree function */
-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_gen_subtree_data_t;
+typedef sysinfo_return_t (*sysinfo_fn_subtree_t)(const char *, bool);
 
 /** Sysinfo subtree (union)
@@ -127 +101 @@
  */
 typedef union {
-        struct sysinfo_item *table;            /**< Fixed subtree (list of subitems) */
-        sysinfo_gen_subtree_data_t generator;  /**< Generated subtree */
+        struct sysinfo_item *table;     /**< Fixed subtree (list of subitems) */
+        sysinfo_fn_subtree_t get_data;  /**< Generated subtree function */
 } sysinfo_subtree_t;
 
@@ -149 +123 @@
 extern void sysinfo_set_item_data(const char *, sysinfo_item_t **, void *,
     size_t);
-extern void sysinfo_set_item_gen_val(const char *, sysinfo_item_t **,
-    sysinfo_fn_val_t, void *);
-extern void sysinfo_set_item_gen_data(const char *, sysinfo_item_t **,
-    sysinfo_fn_data_t, void *);
+extern void sysinfo_set_item_fn_val(const char *, sysinfo_item_t **,
+    sysinfo_fn_val_t);
+extern void sysinfo_set_item_fn_data(const char *, sysinfo_item_t **,
+    sysinfo_fn_data_t);
 extern void sysinfo_set_item_undefined(const char *, sysinfo_item_t **);
 
 extern void sysinfo_set_subtree_fn(const char *, sysinfo_item_t **,
-    sysinfo_fn_subtree_t, void *);
+    sysinfo_fn_subtree_t);
 
 extern void sysinfo_init(void);
 extern void sysinfo_dump(sysinfo_item_t *);
 
-extern sysarg_t sys_sysinfo_get_keys_size(void *, size_t, void *);
-extern sysarg_t sys_sysinfo_get_keys(void *, size_t, void *, size_t, size_t *);
 extern sysarg_t sys_sysinfo_get_val_type(void *, size_t);
 extern sysarg_t sys_sysinfo_get_value(void *, size_t, void *);