Changeset 82122f3 in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2010-12-17T14:51:41Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1f383dde

Parents:

692f13e4 (diff), 11658b64 (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 development into lelian/hidd

File:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (10 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -296 +296 @@
  */
 void sysinfo_set_item_val(const char *name, sysinfo_item_t **root,
-    unative_t val)
+    sysarg_t val)
 {
         /* Protect sysinfo tree consistency */
@@ -481 +481 @@
                 sysinfo_indent(depth);
                 
-                unative_t val;
+                sysarg_t val;
                 size_t size;
                 
@@ -660 +660 @@
  *
  */
-unative_t sys_sysinfo_get_tag(void *path_ptr, size_t path_size)
+sysarg_t sys_sysinfo_get_tag(void *path_ptr, size_t path_size)
 {
         /*
@@ -679 +679 @@
                 ret.tag = SYSINFO_VAL_DATA;
         
-        return (unative_t) ret.tag;
+        return (sysarg_t) ret.tag;
 }
 
@@ -696 +696 @@
  *
  */
-unative_t sys_sysinfo_get_value(void *path_ptr, size_t path_size,
+sysarg_t sys_sysinfo_get_value(void *path_ptr, size_t path_size,
     void *value_ptr)
 {
@@ -715 +715 @@
                 rc = EINVAL;
         
-        return (unative_t) rc;
+        return (sysarg_t) rc;
 }
 
@@ -732 +732 @@
  *
  */
-unative_t sys_sysinfo_get_data_size(void *path_ptr, size_t path_size,
+sysarg_t sys_sysinfo_get_data_size(void *path_ptr, size_t path_size,
     void *size_ptr)
 {
@@ -752 +752 @@
                 rc = EINVAL;
         
-        return (unative_t) rc;
+        return (sysarg_t) rc;
 }
 
@@ -774 +774 @@
  *
  */
-unative_t sys_sysinfo_get_data(void *path_ptr, size_t path_size,
+sysarg_t sys_sysinfo_get_data(void *path_ptr, size_t path_size,
     void *buffer_ptr, size_t buffer_size)
 {
@@ -797 +797 @@
                 free(ret.data.data);
         
-        return (unative_t) rc;
+        return (sysarg_t) rc;
 }