Changeset 9a426d1f in mainline for uspace

Timestamp:

2011-08-28T18:48:21Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

19fc04c

Parents:

dc6b148

Message:

more kernel/uspace ABI unification:
bool, task_id_t, thread_id_t, state_t, SYS_SYSINFO_GET_TAG → SYS_SYSINFO_GET_VAL_TYPE, sysinfo_item_val_type_t

Location:

uspace

Files:

• app/sysinfo/sysinfo.c (modified) (3 diffs)
• app/trace/syscalls.c (modified) (1 diff)
• lib/c/generic/sysinfo.c (modified) (1 diff)
• lib/c/include/bool.h (modified) (1 diff)
• lib/c/include/sysinfo.h (modified) (1 diff)
• lib/c/include/task.h (modified) (1 diff)
• lib/c/include/thread.h (modified) (1 diff)

uspace/app/sysinfo/sysinfo.c

@@ -51 +51 @@
         int rc;
         char *ipath;
-        sysinfo_item_tag_t tag;
+        sysinfo_item_val_type_t tag;
 
         if (argc != 2) {
@@ -60 +60 @@
         ipath = argv[1];
 
-        tag = sysinfo_get_tag(ipath);
+        tag = sysinfo_get_val_type(ipath);
 
         /* Silence warning */
@@ -75 +75 @@
         case SYSINFO_VAL_DATA:
                 rc = print_item_data(ipath);
+                break;
+        default:
+                printf("Error: Sysinfo item '%s' with unknown value type.\n",
+                    ipath);
+                rc = 2;
                 break;
         }

uspace/app/trace/syscalls.c

@@ -75 +75 @@
     [SYS_UNREGISTER_IRQ] = { "unregister_irq",  2,      V_ERRNO },
 
-    [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",                2,      V_INTEGER },
+    [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type",              2,      V_INTEGER },
     [SYS_SYSINFO_GET_VALUE] = { "sysinfo_get_value",            3,      V_ERRNO },
     [SYS_SYSINFO_GET_DATA_SIZE] = { "sysinfo_get_data_size",    3,      V_ERRNO },

uspace/lib/c/generic/sysinfo.c

@@ -47 +47 @@
  *
  */
-sysinfo_item_tag_t sysinfo_get_tag(const char *path)
+sysinfo_item_val_type_t sysinfo_get_val_type(const char *path)
 {
-        return (sysinfo_item_tag_t) __SYSCALL2(SYS_SYSINFO_GET_TAG,
+        return (sysinfo_item_val_type_t) __SYSCALL2(SYS_SYSINFO_GET_VAL_TYPE,
             (sysarg_t) path, (sysarg_t) str_size(path));
 }

uspace/lib/c/include/bool.h

@@ -37 +37 @@
 
 #include <libarch/types.h>
+#include <abi/bool.h>
 
 #define false  0
 #define true   1
-
-typedef uint8_t bool;
 
 #endif

uspace/lib/c/include/sysinfo.h

@@ -36 +36 @@
 #define LIBC_SYSINFO_H_
 
-#include <libc.h>
+#include <sys/types.h>
+#include <bool.h>
+#include <abi/sysinfo.h>
 
-/** Sysinfo value types
- *
- */
-typedef enum {
-        SYSINFO_VAL_UNDEFINED = 0,
-        SYSINFO_VAL_VAL = 1,
-        SYSINFO_VAL_DATA = 2
-} sysinfo_item_tag_t;
-
-extern sysinfo_item_tag_t sysinfo_get_tag(const char *);
+extern sysinfo_item_val_type_t sysinfo_get_val_type(const char *);
 extern int sysinfo_get_value(const char *, sysarg_t *);
 extern void *sysinfo_get_data(const char *, size_t *);

uspace/lib/c/include/task.h

@@ -37 +37 @@
 
 #include <sys/types.h>
-
-typedef uint64_t task_id_t;
+#include <abi/proc/task.h>
 
 typedef enum {

uspace/lib/c/include/thread.h

@@ -38 +38 @@
 #include <libarch/thread.h>
 #include <sys/types.h>
-
-typedef uint64_t thread_id_t;
+#include <abi/proc/thread.h>
 
 extern int thread_create(void (*)(void *), void *, const char *, thread_id_t *);