Changes in uspace/lib/c/generic/ddi.c [fbcdeb8:c6ae4c2] in mainline

File:

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

uspace/lib/c/generic/ddi.c

@@ -45 +45 @@
 #include <align.h>
 #include <libarch/config.h>
-#include "private/libc.h"
 
 /** Return unique device number.
@@ -62 +61 @@
  *
  * @param phys  Physical address of the starting frame.
+ * @param virt  Virtual address of the starting page.
  * @param pages Number of pages to map.
  * @param flags Flags for the new address space area.
- * @param virt  Virtual address of the starting page.
  *
  * @return EOK on success
@@ -73 +72 @@
  *
  */
-int physmem_map(void *phys, size_t pages, unsigned int flags, void **virt)
+int physmem_map(void *phys, void *virt, size_t pages, unsigned int flags)
 {
-        return __SYSCALL5(SYS_PHYSMEM_MAP, (sysarg_t) phys,
-            pages, flags, (sysarg_t) virt, (sysarg_t) __entry);
+        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) phys,
+            (sysarg_t) virt, pages, flags);
 }
 
@@ -82 +81 @@
     unsigned int flags, void **phys)
 {
-        return (int) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size,
-            (sysarg_t) map_flags, (sysarg_t) flags & ~DMAMEM_FLAGS_ANONYMOUS,
-            (sysarg_t) phys, (sysarg_t) virt, 0);
+        return (int) __SYSCALL5(SYS_DMAMEM_MAP, (sysarg_t) virt,
+            (sysarg_t) size, (sysarg_t) map_flags, (sysarg_t) flags,
+            (sysarg_t) phys);
 }
 
@@ -90 +89 @@
     unsigned int flags, void **phys, void **virt)
 {
-        return (int) __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);
+        *virt = as_get_mappable_page(size);
+        if (*virt == NULL)
+                return ENOMEM;
+        
+        return dmamem_map(*virt, size, map_flags,
+            flags | DMAMEM_FLAGS_ANONYMOUS, phys);
 }
 
-int dmamem_unmap(void *virt, size_t size)
+int dmamem_unmap(void *virt, size_t size, unsigned int flags)
 {
-        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, (sysarg_t) size, 0);
+        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, (sysarg_t) size,
+            (sysarg_t) flags);
 }
 
@@ -135 +138 @@
  * @param pio_addr I/O start address.
  * @param size     Size of the I/O region.
- * @param virt     Virtual address for application's
- *                 PIO operations.
+ * @param use_addr Address where the final address for
+ *                 application's PIO will be stored.
  *
- * @return EOK on success.
- * @return Negative error code on failure.
+ * @return Zero on success or negative error code.
  *
  */
-int pio_enable(void *pio_addr, size_t size, void **virt)
+int pio_enable(void *pio_addr, size_t size, void **use_addr)
 {
+        void *phys;
+        void *virt;
+        size_t offset;
+        unsigned int pages;
+        
 #ifdef IO_SPACE_BOUNDARY
         if (pio_addr < IO_SPACE_BOUNDARY) {
-                *virt = pio_addr;
+                *use_addr = pio_addr;
                 return iospace_enable(task_get_id(), pio_addr, size);
         }
 #endif
         
-        void *phys_frame =
-            (void *) ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
-        size_t offset = pio_addr - phys_frame;
-        size_t pages = SIZE2PAGES(offset + size);
-        
-        void *virt_page;
-        int rc = physmem_map(phys_frame, pages,
-            AS_AREA_READ | AS_AREA_WRITE, &virt_page);
-        if (rc != EOK)
-                return rc;
-        
-        *virt = virt_page + offset;
-        return EOK;
+        phys = (void *) ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
+        offset = pio_addr - phys;
+        pages = ALIGN_UP(offset + size, PAGE_SIZE) >> PAGE_WIDTH;
+        virt = as_get_mappable_page(pages << PAGE_WIDTH);
+        *use_addr = virt + offset;
+        return physmem_map(phys, virt, pages, AS_AREA_READ | AS_AREA_WRITE);
 }
 
@@ -176 +176 @@
  *
  */
-int irq_register(int inr, int devno, int method, irq_code_t *ucode)
+int register_irq(int inr, int devno, int method, irq_code_t *ucode)
 {
-        return __SYSCALL4(SYS_IRQ_REGISTER, inr, devno, method,
+        return __SYSCALL4(SYS_REGISTER_IRQ, inr, devno, method,
             (sysarg_t) ucode);
 }
@@ -190 +190 @@
  *
  */
-int irq_unregister(int inr, int devno)
+int unregister_irq(int inr, int devno)
 {
-        return __SYSCALL2(SYS_IRQ_UNREGISTER, inr, devno);
+        return __SYSCALL2(SYS_UNREGISTER_IRQ, inr, devno);
 }