Changeset 132ab5d1 in mainline for uspace/lib/c/generic/ddi.c

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/c/generic/ddi.c (modified) (8 diffs)

uspace/lib/c/generic/ddi.c

@@ -71 +71 @@
 int physmem_map(uintptr_t phys, size_t pages, unsigned int flags, void **virt)
 {
-        return __SYSCALL5(SYS_PHYSMEM_MAP, (sysarg_t) phys,
+        return (int) __SYSCALL5(SYS_PHYSMEM_MAP, (sysarg_t) phys,
             pages, flags, (sysarg_t) virt, (sysarg_t) __entry);
 }
@@ -87 +87 @@
 int physmem_unmap(void *virt)
 {
-        return __SYSCALL1(SYS_PHYSMEM_UNMAP, (sysarg_t) virt);
+        return (int) __SYSCALL1(SYS_PHYSMEM_UNMAP, (sysarg_t) virt);
 }
 
@@ -150 +150 @@
 int dmamem_unmap(void *virt, size_t size)
 {
-        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, (sysarg_t) size, 0);
+        return (int) __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, (sysarg_t) size, 0);
 }
 
 int dmamem_unmap_anonymous(void *virt)
 {
-        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, 0,
+        return (int) __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, 0,
             DMAMEM_FLAGS_ANONYMOUS);
 }
@@ -181 +181 @@
         };
         
-        return __SYSCALL1(SYS_IOSPACE_ENABLE, (sysarg_t) &arg);
+        return (int) __SYSCALL1(SYS_IOSPACE_ENABLE, (sysarg_t) &arg);
 }
 
@@ -205 +205 @@
         };
         
-        return __SYSCALL1(SYS_IOSPACE_DISABLE, (sysarg_t) &arg);
+        return (int) __SYSCALL1(SYS_IOSPACE_DISABLE, (sysarg_t) &arg);
 }
 
@@ -226 +226 @@
  *
  * @return EOK on success.
- * @return Negative error code on failure.
+ * @return An error code on failure.
  *
  */
@@ -268 +268 @@
  *
  * @return EOK on success.
- * @return Negative error code on failure.
+ * @return An error code on failure.
  *
  */
@@ -306 +306 @@
  *
  * @return EOK on success.
- * @return Negative error code on failure.
+ * @return An error code on failure.
  *
  */