Changeset 719a208 in mainline for uspace

Timestamp:

2017-05-30T05:59:09Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f2460a50

Parents:

456c086

Message:

Rename SYS_CAP_GRANT/REVOKE to SYS_PERM_GRANT/REVOKE

Location:

uspace

Files:

• app/trace/syscalls.c (modified) (1 diff)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/perm.c (moved) (moved from uspace/lib/c/generic/cap.c ) (1 diff)
• lib/c/include/perm.h (moved) (moved from uspace/lib/c/include/cap.h ) (1 diff)

uspace/app/trace/syscalls.c

@@ -68 +68 @@
     [SYS_IPC_EVENT_UNMASK] = { "ipc_event_unmask",      1,      V_ERRNO },
 
-    [SYS_CAP_GRANT] = { "cap_grant",                    2,      V_ERRNO },
-    [SYS_CAP_REVOKE] = { "cap_revoke",                  2,      V_ERRNO },
+    [SYS_PERM_GRANT] = { "perm_grant",                  2,      V_ERRNO },
+    [SYS_PERM_REVOKE] = { "perm_revoke",                2,      V_ERRNO },
     [SYS_PHYSMEM_MAP] = { "physmem_map",                4,      V_ERRNO },
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },

uspace/lib/c/Makefile

@@ -63 +63 @@
         generic/bd.c \
         generic/bd_srv.c \
-        generic/cap.c \
+        generic/perm.c \
         generic/clipboard.c \
         generic/config.c \

uspace/lib/c/generic/perm.c

@@ -31 +31 @@
  */
 /**
- * @file  cap.c
- * @brief Functions to grant/revoke capabilities to/from a task.
+ * @file  perm.c
+ * @brief Functions to grant/revoke permissions to/from a task.
  */
 
-#include <cap.h>
+#include <perm.h>
 #include <task.h>
 #include <libc.h>
 #include <libarch/types.h>
 
-/** Grant capabilities to a task.
+/** Grant permissions to a task.
  *
- * @param id   Destination task ID.
- * @param caps Capabilities to grant.
+ * @param id    Destination task ID.
+ * @param perms Permissions to grant.
  *
  * @return Zero on success or a value from @ref errno.h on failure.
  *
  */
-int cap_grant(task_id_t id, unsigned int caps)
+int perm_grant(task_id_t id, unsigned int perms)
 {
 #ifdef __32_BITS__
         sysarg64_t arg = (sysarg64_t) id;
-        return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) &arg, (sysarg_t) caps);
+        return __SYSCALL2(SYS_PERM_GRANT, (sysarg_t) &arg, (sysarg_t) perms);
 #endif
         
 #ifdef __64_BITS__
-        return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) id, (sysarg_t) caps);
+        return __SYSCALL2(SYS_PERM_GRANT, (sysarg_t) id, (sysarg_t) perms);
 #endif
 }
 
-/** Revoke capabilities from a task.
+/** Revoke permissions from a task.
  *
- * @param id   Destination task ID.
- * @param caps Capabilities to revoke.
+ * @param id    Destination task ID.
+ * @param perms Permissions to revoke.
  *
  * @return Zero on success or a value from @ref errno.h on failure.
  *
  */
-int cap_revoke(task_id_t id, unsigned int caps)
+int perm_revoke(task_id_t id, unsigned int perms)
 {
 #ifdef __32_BITS__
         sysarg64_t arg = (sysarg64_t) id;
-        return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) &arg, (sysarg_t) caps);
+        return __SYSCALL2(SYS_PERM_REVOKE, (sysarg_t) &arg, (sysarg_t) perms);
 #endif
         
 #ifdef __64_BITS__
-        return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) id, (sysarg_t) caps);
+        return __SYSCALL2(SYS_PERM_REVOKE, (sysarg_t) id, (sysarg_t) perms);
 #endif
 }

uspace/lib/c/include/perm.h

@@ -33 +33 @@
  */
 
-#ifndef LIB_CAP_H_
-#define LIB_CAP_H_
+#ifndef LIB_PERM_H_
+#define LIB_PERM_H_
 
 #include <task.h>
 
-extern int cap_grant(task_id_t id, unsigned int caps);
-extern int cap_revoke(task_id_t id, unsigned int caps);
+extern int perm_grant(task_id_t, unsigned int);
+extern int perm_revoke(task_id_t, unsigned int);
 
 #endif