Changes in kernel/generic/src/ddi/ddi.c [a53ed3a:14741a0] in mainline

File:

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

kernel/generic/src/ddi/ddi.c

@@ -104 +104 @@
  *
  */
-NO_TRACE static errno_t physmem_map(uintptr_t phys, size_t pages,
+NO_TRACE static int physmem_map(uintptr_t phys, size_t pages,
     unsigned int flags, uintptr_t *virt, uintptr_t bound)
 {
@@ -210 +210 @@
 }
 
-NO_TRACE static errno_t physmem_unmap(uintptr_t virt)
+NO_TRACE static int physmem_unmap(uintptr_t virt)
 {
         assert(TASK);
@@ -228 +228 @@
  *
  */
-sys_errno_t sys_physmem_map(uintptr_t phys, size_t pages, unsigned int flags,
+sysarg_t sys_physmem_map(uintptr_t phys, size_t pages, unsigned int flags,
     void *virt_ptr, uintptr_t bound)
 {
         uintptr_t virt;
-        errno_t rc = copy_from_uspace(&virt, virt_ptr, sizeof(virt));
+        int rc = copy_from_uspace(&virt, virt_ptr, sizeof(virt));
         if (rc != EOK)
                 return rc;
@@ -250 +250 @@
 }
 
-sys_errno_t sys_physmem_unmap(uintptr_t virt)
+sysarg_t sys_physmem_unmap(uintptr_t virt)
 {
         return physmem_unmap(virt);
@@ -265 +265 @@
  *
  */
-NO_TRACE static errno_t iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
+NO_TRACE static int iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
 {
         /*
@@ -290 +290 @@
         /* Lock the task and release the lock protecting tasks_btree. */
         irq_spinlock_exchange(&tasks_lock, &task->lock);
-        errno_t rc = ddi_iospace_enable_arch(task, ioaddr, size);
+        int rc = ddi_iospace_enable_arch(task, ioaddr, size);
         irq_spinlock_unlock(&task->lock, true);
 
@@ -306 +306 @@
  *
  */
-NO_TRACE static errno_t iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size)
+NO_TRACE static int iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size)
 {
         /*
@@ -331 +331 @@
         /* Lock the task and release the lock protecting tasks_btree. */
         irq_spinlock_exchange(&tasks_lock, &task->lock);
-        errno_t rc = ddi_iospace_disable_arch(task, ioaddr, size);
+        int rc = ddi_iospace_disable_arch(task, ioaddr, size);
         irq_spinlock_unlock(&task->lock, true);
         
@@ -344 +344 @@
  *
  */
-sys_errno_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
+sysarg_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
 {
         ddi_ioarg_t arg;
-        errno_t rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
-        if (rc != EOK)
-                return (sys_errno_t) rc;
-        
-        return (sys_errno_t) iospace_enable((task_id_t) arg.task_id,
+        int rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
+        if (rc != 0)
+                return (sysarg_t) rc;
+        
+        return (sysarg_t) iospace_enable((task_id_t) arg.task_id,
             (uintptr_t) arg.ioaddr, (size_t) arg.size);
 }
 
-sys_errno_t sys_iospace_disable(ddi_ioarg_t *uspace_io_arg)
+sysarg_t sys_iospace_disable(ddi_ioarg_t *uspace_io_arg)
 {
         ddi_ioarg_t arg;
-        errno_t rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
-        if (rc != EOK)
-                return (sys_errno_t) rc;
-
-        return (sys_errno_t) iospace_disable((task_id_t) arg.task_id,
+        int rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
+        if (rc != 0)
+                return (sysarg_t) rc;
+
+        return (sysarg_t) iospace_disable((task_id_t) arg.task_id,
             (uintptr_t) arg.ioaddr, (size_t) arg.size);
 }
 
-NO_TRACE static errno_t dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
+NO_TRACE static int dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
     unsigned int flags, uintptr_t *phys)
 {
@@ -375 +375 @@
 }
 
-NO_TRACE static errno_t dmamem_map_anonymous(size_t size, uintptr_t constraint,
+NO_TRACE static int dmamem_map_anonymous(size_t size, uintptr_t constraint,
     unsigned int map_flags, unsigned int flags, uintptr_t *phys,
     uintptr_t *virt, uintptr_t bound)
@@ -403 +403 @@
 }
 
-NO_TRACE static errno_t dmamem_unmap(uintptr_t virt, size_t size)
+NO_TRACE static int dmamem_unmap(uintptr_t virt, size_t size)
 {
         // TODO: implement unlocking & unmap
@@ -409 +409 @@
 }
 
-NO_TRACE static errno_t dmamem_unmap_anonymous(uintptr_t virt)
+NO_TRACE static int dmamem_unmap_anonymous(uintptr_t virt)
 {
         return as_area_destroy(TASK->as, virt);
 }
 
-sys_errno_t sys_dmamem_map(size_t size, unsigned int map_flags, unsigned int flags,
+sysarg_t sys_dmamem_map(size_t size, unsigned int map_flags, unsigned int flags,
     void *phys_ptr, void *virt_ptr, uintptr_t bound)
 {
@@ -423 +423 @@
                 
                 uintptr_t phys;
-                errno_t rc = dmamem_map((uintptr_t) virt_ptr, size, map_flags,
+                int rc = dmamem_map((uintptr_t) virt_ptr, size, map_flags,
                     flags, &phys);
                 
@@ -440 +440 @@
                 
                 uintptr_t constraint;
-                errno_t rc = copy_from_uspace(&constraint, phys_ptr,
+                int rc = copy_from_uspace(&constraint, phys_ptr,
                     sizeof(constraint));
                 if (rc != EOK)
@@ -472 +472 @@
 }
 
-sys_errno_t sys_dmamem_unmap(uintptr_t virt, size_t size, unsigned int flags)
+sysarg_t sys_dmamem_unmap(uintptr_t virt, size_t size, unsigned int flags)
 {
         if ((flags & DMAMEM_FLAGS_ANONYMOUS) == 0)