Changeset 00aece0 in mainline for kernel/generic/include/sysinfo/sysinfo.h

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/generic/include/sysinfo/sysinfo.h (modified) (2 diffs)

kernel/generic/include/sysinfo/sysinfo.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <str.h>
+#include <abi/sysinfo.h>
 
 /** Framebuffer info exported flags */
 extern bool fb_exported;
-
-/** Item value type
- *
- */
-typedef enum {
-        SYSINFO_VAL_UNDEFINED = 0,     /**< Undefined value */
-        SYSINFO_VAL_VAL = 1,           /**< Constant numeric value */
-        SYSINFO_VAL_DATA = 2,          /**< Constant binary data */
-        SYSINFO_VAL_FUNCTION_VAL = 3,  /**< Generated numeric value */
-        SYSINFO_VAL_FUNCTION_DATA = 4  /**< Generated binary data */
-} sysinfo_item_val_type_t;
 
 /** Subtree type
@@ -145 +135 @@
 extern void sysinfo_dump(sysinfo_item_t *);
 
-extern sysarg_t sys_sysinfo_get_tag(void *, size_t);
+extern sysarg_t sys_sysinfo_get_val_type(void *, size_t);
 extern sysarg_t sys_sysinfo_get_value(void *, size_t, void *);
 extern sysarg_t sys_sysinfo_get_data_size(void *, size_t, void *);