Changes in kernel/generic/src/ddi/ddi.c [8cd680c:63e27ef] in mainline

File:

• kernel/generic/src/ddi/ddi.c (modified) (11 diffs)

kernel/generic/src/ddi/ddi.c

@@ -40 +40 @@
  */
 
+#include <assert.h>
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <security/cap.h>
+#include <security/perm.h>
 #include <mm/frame.h>
 #include <mm/as.h>
@@ -96 +97 @@
  *
  * @return EOK on success.
- * @return EPERM if the caller lacks capabilities to use this syscall.
+ * @return EPERM if the caller lacks permissions to use this syscall.
  * @return EBADMEM if phys is not page aligned.
  * @return ENOENT if there is no task matching the specified ID or
@@ -106 +107 @@
     unsigned int flags, uintptr_t *virt, uintptr_t bound)
 {
-        ASSERT(TASK);
+        assert(TASK);
         
         if ((phys % FRAME_SIZE) != 0)
@@ -116 +117 @@
          */
         bool priv =
-            ((cap_get(TASK) & CAP_MEM_MANAGER) == CAP_MEM_MANAGER);
+            ((perm_get(TASK) & PERM_MEM_MANAGER) == PERM_MEM_MANAGER);
         
         mem_backend_data_t backend_data;
@@ -211 +212 @@
 NO_TRACE static int physmem_unmap(uintptr_t virt)
 {
-        ASSERT(TASK);
+        assert(TASK);
 
         return as_area_destroy(TASK->as, virt);
@@ -260 +261 @@
  * @param size   Size of the enabled I/O space.
  *
- * @return 0 on success, EPERM if the caller lacks capabilities to use this
+ * @return 0 on success, EPERM if the caller lacks permissions to use this
  *           syscall, ENOENT if there is no task matching the specified ID.
  *
@@ -269 +270 @@
          * Make sure the caller is authorised to make this syscall.
          */
-        cap_t caps = cap_get(TASK);
-        if (!(caps & CAP_IO_MANAGER))
+        perm_t perms = perm_get(TASK);
+        if (!(perms & PERM_IO_MANAGER))
                 return EPERM;
         
@@ -301 +302 @@
  * @param size   Size of the enabled I/O space.
  *
- * @return 0 on success, EPERM if the caller lacks capabilities to use this
+ * @return 0 on success, EPERM if the caller lacks permissions to use this
  *           syscall, ENOENT if there is no task matching the specified ID.
  *
@@ -310 +311 @@
          * Make sure the caller is authorised to make this syscall.
          */
-        cap_t caps = cap_get(TASK);
-        if (!(caps & CAP_IO_MANAGER))
+        perm_t perms = perm_get(TASK);
+        if (!(perms & PERM_IO_MANAGER))
                 return EPERM;
         
@@ -368 +369 @@
     unsigned int flags, uintptr_t *phys)
 {
-        ASSERT(TASK);
+        assert(TASK);
         
         // TODO: implement locking of non-anonymous mapping
@@ -378 +379 @@
     uintptr_t *virt, uintptr_t bound)
 {
-        ASSERT(TASK);
+        assert(TASK);
         
         size_t frames = SIZE2FRAMES(size);