Changes in uspace/lib/c/generic/ddi.c [aa537a5a:b7fd2a0] in mainline

File:

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

uspace/lib/c/generic/ddi.c

@@ -69 +69 @@
  *
  */
-int physmem_map(uintptr_t phys, size_t pages, unsigned int flags, void **virt)
-{
-        return __SYSCALL5(SYS_PHYSMEM_MAP, (sysarg_t) phys,
+errno_t physmem_map(uintptr_t phys, size_t pages, unsigned int flags, void **virt)
+{
+        return (errno_t) __SYSCALL5(SYS_PHYSMEM_MAP, (sysarg_t) phys,
             pages, flags, (sysarg_t) virt, (sysarg_t) __entry);
 }
@@ -85 +85 @@
  *
  */
-int physmem_unmap(void *virt)
-{
-        return __SYSCALL1(SYS_PHYSMEM_UNMAP, (sysarg_t) virt);
+errno_t physmem_unmap(void *virt)
+{
+        return (errno_t) __SYSCALL1(SYS_PHYSMEM_UNMAP, (sysarg_t) virt);
 }
 
@@ -110 +110 @@
  *
  */
-int dmamem_map(void *virt, size_t size, unsigned int map_flags,
+errno_t dmamem_map(void *virt, size_t size, unsigned int map_flags,
     unsigned int flags, uintptr_t *phys)
 {
-        return (int) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size,
+        return (errno_t) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size,
             (sysarg_t) map_flags, (sysarg_t) flags & ~DMAMEM_FLAGS_ANONYMOUS,
             (sysarg_t) phys, (sysarg_t) virt, 0);
@@ -138 +138 @@
  *
  */
-int dmamem_map_anonymous(size_t size, uintptr_t constraint,
+errno_t dmamem_map_anonymous(size_t size, uintptr_t constraint,
     unsigned int map_flags, unsigned int flags, uintptr_t *phys, void **virt)
 {
         *phys = constraint;
         
-        return (int) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size,
+        return (errno_t) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size,
             (sysarg_t) map_flags, (sysarg_t) flags | DMAMEM_FLAGS_ANONYMOUS,
             (sysarg_t) phys, (sysarg_t) virt, (sysarg_t) __entry);
 }
 
-int dmamem_unmap(void *virt, size_t size)
-{
-        return __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,
+errno_t dmamem_unmap(void *virt, size_t size)
+{
+        return (errno_t) __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, (sysarg_t) size, 0);
+}
+
+errno_t dmamem_unmap_anonymous(void *virt)
+{
+        return (errno_t) __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, 0,
             DMAMEM_FLAGS_ANONYMOUS);
 }
@@ -173 +173 @@
  *
  */
-static int iospace_enable(task_id_t id, void *ioaddr, size_t size)
+static errno_t iospace_enable(task_id_t id, void *ioaddr, size_t size)
 {
         const ddi_ioarg_t arg = {
@@ -181 +181 @@
         };
         
-        return __SYSCALL1(SYS_IOSPACE_ENABLE, (sysarg_t) &arg);
+        return (errno_t) __SYSCALL1(SYS_IOSPACE_ENABLE, (sysarg_t) &arg);
 }
 
@@ -197 +197 @@
  *
  */
-static int iospace_disable(task_id_t id, void *ioaddr, size_t size)
+static errno_t iospace_disable(task_id_t id, void *ioaddr, size_t size)
 {
         const ddi_ioarg_t arg = {
@@ -205 +205 @@
         };
         
-        return __SYSCALL1(SYS_IOSPACE_DISABLE, (sysarg_t) &arg);
+        return (errno_t) __SYSCALL1(SYS_IOSPACE_DISABLE, (sysarg_t) &arg);
 }
 
@@ -213 +213 @@
  * @param virt  Virtual address for application's PIO operations. 
  */
-int pio_enable_range(addr_range_t *range, void **virt)
+errno_t pio_enable_range(addr_range_t *range, void **virt)
 {
         return pio_enable(RNGABSPTR(*range), RNGSZ(*range), virt);
@@ -226 +226 @@
  *
  * @return EOK on success.
- * @return Negative error code on failure.
- *
- */
-int pio_enable_resource(pio_window_t *win, hw_resource_t *res, void **virt)
+ * @return An error code on failure.
+ *
+ */
+errno_t pio_enable_resource(pio_window_t *win, hw_resource_t *res, void **virt)
 {
         uintptr_t addr;
@@ -268 +268 @@
  *
  * @return EOK on success.
- * @return Negative error code on failure.
- *
- */
-int pio_enable(void *pio_addr, size_t size, void **virt)
+ * @return An error code on failure.
+ *
+ */
+errno_t pio_enable(void *pio_addr, size_t size, void **virt)
 {
 #ifdef IO_SPACE_BOUNDARY
@@ -291 +291 @@
         
         void *virt_page = AS_AREA_ANY;
-        int rc = physmem_map(phys_frame, pages,
+        errno_t rc = physmem_map(phys_frame, pages,
             AS_AREA_READ | AS_AREA_WRITE, &virt_page);
         if (rc != EOK)
@@ -306 +306 @@
  *
  * @return EOK on success.
- * @return Negative error code on failure.
- *
- */
-int pio_disable(void *virt, size_t size)
+ * @return An error code on failure.
+ *
+ */
+errno_t pio_disable(void *virt, size_t size)
 {
 #ifdef IO_SPACE_BOUNDARY