Changes in uspace/lib/c/generic/cap.c [6b10dab:63f8966] in mainline

File:

• uspace/lib/c/generic/cap.c (modified) (2 diffs)

uspace/lib/c/generic/cap.c

@@ -31 +31 @@
  */
 /**
- * @file  cap.c
- * @brief Functions to grant/revoke capabilities to/from a task.
+ * @file        cap.c
+ * @brief       Functions to grant/revoke capabilities to/from a task.
  */
 
@@ -38 +38 @@
 #include <task.h>
 #include <libc.h>
+#include <kernel/syscall/sysarg64.h>
 
 /** Grant capabilities to a task.
  *
- * @param id   Destination task ID.
+ * @param id Destination task ID.
  * @param caps Capabilities 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)
 {
-#ifdef __32_BITS__
-        sysarg64_t arg = (sysarg64_t) id;
+        sysarg64_t arg;
+        
+        arg.value = (unsigned long long) id;
+
         return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) &arg, (sysarg_t) caps);
-#endif
-        
-#ifdef __64_BITS__
-        return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) id, (sysarg_t) caps);
-#endif
 }
 
 /** Revoke capabilities from a task.
  *
- * @param id   Destination task ID.
+ * @param id Destination task ID.
  * @param caps Capabilities 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)
 {
-#ifdef __32_BITS__
-        sysarg64_t arg = (sysarg64_t) id;
+        sysarg64_t arg;
+        
+        arg.value = (unsigned long long) id;
+
         return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) &arg, (sysarg_t) caps);
-#endif
-        
-#ifdef __64_BITS__
-        return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) id, (sysarg_t) caps);
-#endif
 }